From fbfd62b73e3b0b3b4ce7a9e94908a16fd0f467aa Mon Sep 17 00:00:00 2001 From: necrodoom Date: Tue, 7 Aug 2012 11:04:01 +0300 Subject: [PATCH 1/5] update permissions to include new nodes --- Essentials/src/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 34d13bf5a..9ba0f7e83 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -156,11 +156,13 @@ player-commands: - signs.use.disposal - signs.use.enchant - signs.use.free - - signs.use.gamemode + - signs.use.gamemode - signs.use.heal + - signs.use.info - signs.use.kit - signs.use.mail - signs.use.protection + - signs.use.repair - signs.use.sell - signs.use.time - signs.use.trade From 30d5468be0b4f69eb43698add7f89cfe69c97c71 Mon Sep 17 00:00:00 2001 From: necrodoom Date: Tue, 7 Aug 2012 11:07:52 +0300 Subject: [PATCH 2/5] update with new workbench node --- EssentialsGroupManager/src/globalgroups.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/EssentialsGroupManager/src/globalgroups.yml b/EssentialsGroupManager/src/globalgroups.yml index a9a1f22cf..2027195e4 100644 --- a/EssentialsGroupManager/src/globalgroups.yml +++ b/EssentialsGroupManager/src/globalgroups.yml @@ -222,6 +222,7 @@ groups: - essentials.warp.* - essentials.weather - essentials.whois + - essentials.workbench - essentials.world - essentials.world.* From 264eb318b80ee7fde64f360a74fee4a5eb58f01b Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 7 Aug 2012 20:39:55 +1000 Subject: [PATCH 3/5] Clean up spaces in config. Please don't break this in the future, this is the second fix guys. --- Essentials/src/config.yml | 6 +++--- Essentials/src/items.csv | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 9ba0f7e83..5cfa8a4d7 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -196,7 +196,7 @@ kits: delay: 10 items: - 272 1 - - 273 1 + - 273 1 - 274 1 - 275 1 @@ -209,7 +209,7 @@ kits: enabledSigns: #- color #- balance - #- buy + #- buy #- sell #- trade #- free @@ -514,7 +514,7 @@ protect: ender_dragon: false pig: false sheep: false - cow: false + cow: false chicken: false squid: false wolf: false diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv index 29920e69f..986331445 100644 --- a/Essentials/src/items.csv +++ b/Essentials/src/items.csv @@ -1733,6 +1733,8 @@ endgooframe,120,0 endergooframe,120,0 egooframe,120,0 eportalframe,120,0 +enderframe,120,0 +endframe,120,0 enderstone,121,0 endstone,121,0 endrock,121,0 From d2b30bad99403ff12c724c76edd72c9a39a1f5ba Mon Sep 17 00:00:00 2001 From: necrodoom Date: Tue, 7 Aug 2012 15:27:25 +0300 Subject: [PATCH 4/5] another extra space --- Essentials/src/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Essentials/src/config.yml b/Essentials/src/config.yml index 5cfa8a4d7..617fb6677 100644 --- a/Essentials/src/config.yml +++ b/Essentials/src/config.yml @@ -456,7 +456,7 @@ protect: alert: on-placement: 10,11,46,327 on-use: 327 - on-break: + on-break: blacklist: From 54133cd75e53d67e431a36669f164eabd3b80c81 Mon Sep 17 00:00:00 2001 From: snowleo Date: Tue, 7 Aug 2012 16:03:12 +0200 Subject: [PATCH 5/5] Prevent errors in listeners affecting EssentialsChat --- .../essentials/chat/EssentialsChatPlayer.java | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java index 9dce1169c..1ebb6389c 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java @@ -6,6 +6,7 @@ import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; import java.util.Map; +import java.util.logging.Level; import java.util.logging.Logger; import org.bukkit.Location; import org.bukkit.Server; @@ -46,11 +47,25 @@ public abstract class EssentialsChatPlayer implements Listener } synchronized (listeners) { - for (IEssentialsChatListener listener : listeners.values()) + for (Map.Entry listener : listeners.entrySet()) { - if (listener.shouldHandleThisChat(event)) + try { - return true; + if (listener.getValue().shouldHandleThisChat(event)) + { + return true; + } + } + catch (Throwable t) + { + if (ess.getSettings().isDebug()) + { + logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage(), t); + } + else + { + logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage()); + } } } } @@ -160,9 +175,23 @@ public abstract class EssentialsChatPlayer implements Listener String message = String.format(event.getFormat(), type.concat(sender.getDisplayName()), event.getMessage()); synchronized (listeners) { - for (IEssentialsChatListener listener : listeners.values()) + for (Map.Entry listener : listeners.entrySet()) { - message = listener.modifyMessage(event, onlinePlayer, message); + try + { + message = listener.getValue().modifyMessage(event, onlinePlayer, message); + } + catch (Throwable t) + { + if (ess.getSettings().isDebug()) + { + logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage(), t); + } + else + { + logger.log(Level.WARNING, "Error with EssentialsChat listener of " + listener.getKey() + ": " + t.getMessage()); + } + } } } onlineUser.sendMessage(message);