EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

The defender isn't necessarily a player here

Browse Source 
Besides, the defender doesn’t need to have the player data key anyways
This commit is contained in:
TfT_02 2014-02-16 00:11:15 +01:00
parent d9c04a09ba
commit 9f9de86d21
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -143,7 +143,7 @@ public class EntityListener implements Listener {
return; return;
} }
if (!UserManager.hasPlayerDataKey(defender) || !defender.isValid() || !(defender instanceof LivingEntity)) { if (Misc.isNPCEntity(defender) || !defender.isValid() || !(defender instanceof LivingEntity)) {
return; return;
} }

2
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -197,7 +197,7 @@ public final class CombatUtils {
if (attacker instanceof Player && entityType == EntityType.PLAYER) { if (attacker instanceof Player && entityType == EntityType.PLAYER) {
Player player = (Player) attacker; Player player = (Player) attacker;
if (Misc.isNPCEntity(player)) { if (!UserManager.hasPlayerDataKey(player)) {
return; return;
} }