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
commita2813358afdb332be7078b87e5961659eebc722b (patch)
tree7c50940ae55e6f0d15fdf684ff6b7df01e21e37c
parent19ccdf219318f3f8e5382dcae8966e429a07a6a8 (diff)
downloadEssentials-a2813358afdb332be7078b87e5961659eebc722b.tar
Essentials-a2813358afdb332be7078b87e5961659eebc722b.tar.gz
Essentials-a2813358afdb332be7078b87e5961659eebc722b.tar.lz
Essentials-a2813358afdb332be7078b87e5961659eebc722b.tar.xz
Essentials-a2813358afdb332be7078b87e5961659eebc722b.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;