diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java | 2 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 9 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandunban.java | 3 | ||||
| -rw-r--r-- | lib/bukkit.jar | bin | 4830059 -> 4830386 bytes | |||
| -rw-r--r-- | lib/craftbukkit.jar | bin | 12536720 -> 12541185 bytes |
5 files changed, 9 insertions, 5 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/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 93b793e49..9232ce1a0 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -439,9 +439,12 @@ public class EssentialsPlayerListener implements Listener case RIGHT_CLICK_BLOCK: if (!event.isCancelled() && event.getClickedBlock().getTypeId() == BED && ess.getSettings().getUpdateBedAtDaytime()) { - Player player = event.getPlayer(); - player.setBedSpawnLocation(event.getClickedBlock().getLocation()); - player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); + User player = ess.getUser(event.getPlayer()); + if (player.isAuthorized("essentials.sethome.bed")) + { + player.setBedSpawnLocation(event.getClickedBlock().getLocation()); + player.sendMessage(_("homeSet", player.getLocation().getWorld().getName(), player.getLocation().getBlockX(), player.getLocation().getBlockY(), player.getLocation().getBlockZ())); + } } break; case LEFT_CLICK_AIR: 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; diff --git a/lib/bukkit.jar b/lib/bukkit.jar Binary files differindex f9a250e65..002b84f21 100644 --- a/lib/bukkit.jar +++ b/lib/bukkit.jar diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar Binary files differindex 19a363915..b8dd7eab2 100644 --- a/lib/craftbukkit.jar +++ b/lib/craftbukkit.jar |