stephenseo/TurnBasedMinecraftMod
1
0
Fork 0
Code Issues Pull requests Projects Releases 21 Wiki Activity Actions

Fix bug where player can enter battle with self

Browse source
This commit is contained in:
Stephen Seo 2018-10-20 20:06:18 +09:00
parent bd7d7e16f3
commit faf7a02619
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/seodisparate/TurnBasedMinecraft/common/AttackEventHandler.java
View file

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