From 15da9d580b59452ef263c3ce86c0d9ed2bfdcbe8 Mon Sep 17 00:00:00 2001 From: GJ Date: Sun, 28 Apr 2013 16:52:14 -0400 Subject: [PATCH] The previous CombatTag fix should take care of these. --- src/main/java/com/gmail/nossr50/listeners/PlayerListener.java | 4 ---- src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index c0b9d1260..086eb8c00 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -115,10 +115,6 @@ public class PlayerListener implements Listener { McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); - if (mcMMOPlayer == null) { - return; - } - if (mcMMOPlayer.getGodMode() && !Permissions.mcgod(player)) { mcMMOPlayer.toggleGodMode(); player.sendMessage(LocaleLoader.getString("Commands.GodMode.Forbidden")); diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index fd85efdfb..43747925d 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -262,7 +262,7 @@ public final class CombatUtils { if (target instanceof Player) { Player player = (Player) target; - if (Misc.isNPCEntity(player) || !player.isOnline()) { + if (Misc.isNPCEntity(player)) { return; }