Fixed that players with PvP OFF couldn't attack owned entities

PR #252
Lembas-Modding-Team · Sep 8, 2018 · 62b9be4 · 62b9be4
1 parent 424140c
commit 62b9be4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 #### Bug fixes:
 * Fixed a crash with some ownable entities
+* Fixed that players with PvP disabled couldn't attack themselves or their owned entities
 
 ### LOTR compatibility:
 * Updated to Beta 34.1 of the LOTR Mod

diff --git a/src/main/java/pvpmode/PvPEventHandler.java b/src/main/java/pvpmode/PvPEventHandler.java
@@ -33,7 +33,7 @@ public void interceptPvP (LivingAttackEvent event)
         EntityPlayerMP attacker = PvPUtils.getMaster (event.source.getEntity ());
         EntityPlayerMP victim = PvPUtils.getMaster (event.entity);
 
-        if (attacker == null || victim == null)
+        if (attacker == null || victim == null || attacker == victim)
             return;
 
         EnumPvPMode attackerMode = PvPUtils.getPvPMode (attacker);