Merge branch 'refs/heads/2.9' into release

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
@@ -194,7 +196,7 @@ kits:
     delay: 10
     items:
       - 272 1
-      - 273 1 
+      - 273 1
       - 274 1
       - 275 1
 
@@ -207,7 +209,7 @@ kits:
 enabledSigns:
   #- color
   #- balance
-  #- buy  
+  #- buy
   #- sell
   #- trade
   #- free
@@ -454,7 +456,7 @@ protect:
   alert:
     on-placement: 10,11,46,327
     on-use: 327
-    on-break: 
+    on-break:
 
   blacklist:
 
@@ -512,7 +514,7 @@ protect:
       ender_dragon: false
       pig: false
       sheep: false
-      cow: false      
+      cow: false
       chicken: false
       squid: false
       wolf: false

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

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<String, IEssentialsChatListener> 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<String, IEssentialsChatListener> 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);

EssentialsGroupManager/src/globalgroups.yml

@@ -222,6 +222,7 @@ groups:
     - essentials.warp.*
     - essentials.weather
     - essentials.whois
+    - essentials.workbench
     - essentials.world
     - essentials.world.*