From f0ecbbf42790a2730acad547b849185a11de72db Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Sat, 9 Apr 2022 23:28:04 +0200
Subject: [PATCH] Fix 1.18 WorldReset

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 .../src/de/steamwar/fightsystem/fight/FightWorld.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
index 914a138..d2e138b 100644
--- a/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
+++ b/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightWorld.java
@@ -32,6 +32,8 @@ import org.bukkit.WorldCreator;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
+import java.util.Objects;
+
 public class FightWorld extends StateDependent {
 
     private static final boolean paper = Bukkit.getVersion().contains("git-Paper");
@@ -63,7 +65,7 @@ public class FightWorld extends StateDependent {
     }
 
     public static void resetWorld(){
-        Recording.iterateOverEntities(entity -> true, entity -> {
+        Recording.iterateOverEntities(Objects::nonNull, entity -> {
             if(entity.getType() != EntityType.PLAYER && (!Config.ArenaLeaveable || Config.ArenaRegion.inRegion(entity.getLocation())))
                 entity.remove();
         });