From b58964dce977d6f962ba32c0f78825b9bef5b107 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Thu, 5 Jul 2018 11:19:28 +0200 Subject: [PATCH] Grant class potion effects separately to make sure class chests aren't forgotten about. This is not the proper way to solve this issue, but the refactoring needed to move the responsibility of class chest search somewhere else is a bit too much for a bug hunt. --- src/main/java/com/garbagemule/MobArena/ArenaClass.java | 3 ++- src/main/java/com/garbagemule/MobArena/ArenaImpl.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/garbagemule/MobArena/ArenaClass.java b/src/main/java/com/garbagemule/MobArena/ArenaClass.java index 4217abc..9166741 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaClass.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaClass.java @@ -165,8 +165,9 @@ public class ArenaClass if (leggings != null) leggings.giveTo(p); if (boots != null) boots.giveTo(p); if (offhand != null) offhand.giveTo(p); + } - // Potion effects + public void grantPotionEffects(Player p) { effects.forEach(thing -> thing.giveTo(p)); } diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java index 28c2729..b3c1234 100644 --- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java @@ -1133,6 +1133,7 @@ public class ArenaImpl implements Arena removePotionEffects(p); arenaPlayer.setArenaClass(arenaClass); arenaClass.grantItems(p); + arenaClass.grantPotionEffects(p); arenaClass.grantLobbyPermissions(p); autoReady(p); @@ -1207,6 +1208,7 @@ public class ArenaImpl implements Arena inv.setBoots(boots); inv.setItemInOffHand(offhand); + arenaClass.grantPotionEffects(p); arenaClass.grantLobbyPermissions(p); autoReady(p);