Add major bugfix to arena system & plugin