From 1443e2f6b87b4676d38b3b39e15bf7223dbf3900 Mon Sep 17 00:00:00 2001 From: bm01 Date: Tue, 3 Jul 2012 03:52:12 +0200 Subject: [PATCH] Removed unneeded null check, according to eclipse :3 --- src/main/java/com/gmail/nossr50/commands/CommandHelper.java | 2 +- src/main/java/com/gmail/nossr50/runnables/BleedTimer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java index 4b120fb78..143fca68e 100644 --- a/src/main/java/com/gmail/nossr50/commands/CommandHelper.java +++ b/src/main/java/com/gmail/nossr50/commands/CommandHelper.java @@ -23,7 +23,7 @@ public class CommandHelper { if (sender instanceof Player) { Player player = (Player) sender; - if (player != null && !Permissions.getInstance().permission(player, permission)) { + if (!Permissions.getInstance().permission(player, permission)) { player.sendMessage(LocaleLoader.getString("mcMMO.NoPermission")); return true; } diff --git a/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java b/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java index 18e0f86e9..95787d85a 100644 --- a/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java +++ b/src/main/java/com/gmail/nossr50/runnables/BleedTimer.java @@ -34,7 +34,7 @@ public class BleedTimer implements Runnable { for (Entry entry : bleedList.entrySet()) { LivingEntity entity = entry.getKey(); - if (entry.getValue() <= 0 || entity.isDead() || entity == null) { + if (entry.getValue() <= 0 || entity.isDead()) { remove(entity); break; }