summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2013-01-17 14:25:19 -0500
committerIaccidentally <coryhuckaby@gmail.com>2013-01-17 14:25:19 -0500
commitb90c4440fd75324438e71af004b1ae3bd7fe0a25 (patch)
treef9db9d7edfdbb6c3571e54b4c03c10729f31391a
parentf64f929960a2a4f5c36f8c845276e3e2a83e81a2 (diff)
downloadEssentials-b90c4440fd75324438e71af004b1ae3bd7fe0a25.tar
Essentials-b90c4440fd75324438e71af004b1ae3bd7fe0a25.tar.gz
Essentials-b90c4440fd75324438e71af004b1ae3bd7fe0a25.tar.lz
Essentials-b90c4440fd75324438e71af004b1ae3bd7fe0a25.tar.xz
Essentials-b90c4440fd75324438e71af004b1ae3bd7fe0a25.zip
Update Bukkit to 1.4.7-R0.1
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/commands/Commandunban.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
index a0d3d091f..7e7e2763f 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java
@@ -9,8 +9,8 @@ import org.bukkit.entity.*;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
import org.bukkit.inventory.ItemStack;
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
index 7d50eafa5..9826814c7 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandunban.java
@@ -32,7 +32,8 @@ public class Commandunban extends EssentialsCommand
catch (NoSuchFieldException e)
{
final OfflinePlayer player = server.getOfflinePlayer(args[0]);
- if (player.isBanned()) {
+ if (player.isBanned())
+ {
player.setBanned(false);
sender.sendMessage(_("unbannedPlayer"));
return;