From ae3b394b4682a532f38fc7da84f8ebd4c79068bb Mon Sep 17 00:00:00 2001
From: Andreas Troelsen <garbagemule@gmail.com>
Date: Sat, 23 Jun 2018 17:14:25 +0200
Subject: [PATCH] Reuse removePotionEffects() in ArenaImpl.

This commit also rearranges the method, placing it closer to the cleanup methods.
---
 .../com/garbagemule/MobArena/ArenaImpl.java     | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java
index 4981395..cbe1796 100644
--- a/src/main/java/com/garbagemule/MobArena/ArenaImpl.java
+++ b/src/main/java/com/garbagemule/MobArena/ArenaImpl.java
@@ -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();