From faf7a02619667ebca7c95a8abae3434251c3ad53 Mon Sep 17 00:00:00 2001 From: Stephen Seo Date: Sat, 20 Oct 2018 20:06:18 +0900 Subject: [PATCH] Fix bug where player can enter battle with self --- .../TurnBasedMinecraft/common/AttackEventHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java index 29f0883..589798e 100644 --- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java +++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java @@ -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))