Updated for BattleArena 3.8.5