]> git.seodisparate.com - TurnBasedMinecraftMod/commitdiff
Fix bug where player can enter battle with self
authorStephen Seo <seo.disparate@gmail.com>
Sat, 20 Oct 2018 11:06:18 +0000 (20:06 +0900)
committerStephen Seo <seo.disparate@gmail.com>
Sat, 20 Oct 2018 11:06:32 +0000 (20:06 +0900)
src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java

index 29f08835b9bf27884af2c43e51a4ad91f7880165..589798e7055e75eab34076c631735c38c79ab394 100644 (file)
@@ -70,6 +70,7 @@ public class AttackEventHandler
         else if(!isAttackerValid(event)
                 && event.getEntity() != null
                 && event.getSource().getTrueSource() != null
+                && event.getEntity() != event.getSource().getTrueSource()
                 && !config.getBattleIgnoringPlayers().contains(event.getSource().getTrueSource().getEntityId())
                 && !config.getBattleIgnoringPlayers().contains(event.getEntity().getEntityId())
                 && battleManager.checkAttack(event))