Upstream/MobArena
1
0
Fork 0
mirror of https://github.com/garbagemule/MobArena.git synced 2024-11-26 20:45:17 +01:00
Code Issues Projects Releases Wiki Activity

Reuse removePotionEffects() in ArenaImpl.

Browse Source 
This commit also rearranges the method, placing it closer to the cleanup methods.
This commit is contained in:
Andreas Troelsen 2018-06-23 17:14:25 +02:00
parent cbf18ff720
commit ae3b394b46
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/garbagemule/MobArena/ArenaImpl.java
View File

@ -1033,12 +1033,6 @@ public class ArenaImpl implements Arena
}
}
private void removePotionEffects(Player p) {
for (PotionEffect effect : p.getActivePotionEffects()) {
p.removePotionEffect(effect.getType());
}
}
private void startSpawner() {
// Set the spawn flags to enable monster spawning.
world.setSpawnFlags(true, true);
@ -1171,10 +1165,7 @@ public class ArenaImpl implements Arena
}
InventoryManager.clearInventory(p);
p.getActivePotionEffects().stream()
.map(PotionEffect::getType)
.forEach(p::removePotionEffect);
removePotionEffects(p);
arenaPlayer.setArenaClass(arenaClass);
arenaClass.grantItems(p);
@ -1343,6 +1334,12 @@ public class ArenaImpl implements Arena
p.recalculatePermissions();
}
private void removePotionEffects(Player p) {
p.getActivePotionEffects().stream()
.map(PotionEffect::getType)
.forEach(p::removePotionEffect);
}
private void cleanup() {
removeMonsters();
removeBlocks();