From 9119f42e5b94f0cea6e4bd41ea9ff0e7b9ecb599 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Fri, 21 Sep 2018 16:33:27 +0900 Subject: [PATCH] Fix client unable to see entity not in config --- .../seodisparate/TurnBasedMinecraft/common/Battle.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java index be80909..1511105 100644 --- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java +++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java @@ -130,7 +130,7 @@ public class Battle for(Entity e : sideA) { EntityInfo entityInfo = TurnBasedMinecraftMod.config.getMatchingEntityInfo(e); - if(entityInfo == null && !(e instanceof EntityPlayer)) + if(entityInfo == null && !(e instanceof EntityPlayer) && TurnBasedMinecraftMod.battleManager != null) { continue; } @@ -159,7 +159,7 @@ public class Battle for(Entity e : sideB) { EntityInfo entityInfo = TurnBasedMinecraftMod.config.getMatchingEntityInfo(e); - if(entityInfo == null && !(e instanceof EntityPlayer)) + if(entityInfo == null && !(e instanceof EntityPlayer) && TurnBasedMinecraftMod.battleManager != null) { continue; } @@ -249,7 +249,7 @@ public class Battle public void addCombatantToSideA(Entity e) { EntityInfo entityInfo = TurnBasedMinecraftMod.config.getMatchingEntityInfo(e); - if(entityInfo == null && !(e instanceof EntityPlayer)) + if(entityInfo == null && !(e instanceof EntityPlayer) && TurnBasedMinecraftMod.battleManager != null) { return; } @@ -289,7 +289,7 @@ public class Battle public void addCombatantToSideB(Entity e) { EntityInfo entityInfo = TurnBasedMinecraftMod.config.getMatchingEntityInfo(e); - if(entityInfo == null && !(e instanceof EntityPlayer)) + if(entityInfo == null && !(e instanceof EntityPlayer) && TurnBasedMinecraftMod.battleManager != null) { return; }