Merge branch 'refs/heads/master' into release

Essentials/src/items.csv

@@ -360,100 +360,100 @@ wtree,17,2
 wlog,17,2
 wtrunk,17,2
 wwood,17,2
-leaves,18,0
-leaf,18,0
-treeleaves,18,0
-logleaves,18,0
-trunkleaves,18,0
-woodleaves,18,0
-oaktreeleaves,18,0
-oaklogleaves,18,0
-oaktrunkleaves,18,0
-oakwoodleaves,18,0
-normaltreeleaves,18,0
-normallogleaves,18,0
-normaltrunkleaves,18,0
-normalwoodleaves,18,0
-otreeleaves,18,0
-ologleaves,18,0
-otrunkleaves,18,0
-owoodleaves,18,0
-ntreeleaves,18,0
-nlogleaves,18,0
-ntrunkleaves,18,0
-nwoodleaves,18,0
-treeleaf,18,0
-logleaf,18,0
-trunkleaf,18,0
-woodleaf,18,0
-oaktreeleaf,18,0
-oaklogleaf,18,0
-oaktrunkleaf,18,0
-oakwoodleaf,18,0
-normaltreeleaf,18,0
-normallogleaf,18,0
-normaltrunkleaf,18,0
-normalwoodleaf,18,0
-otreeleaf,18,0
-ologleaf,18,0
-otrunkleaf,18,0
-owoodleaf,18,0
-ntreeleaf,18,0
-nlogleaf,18,0
-ntrunkleaf,18,0
-nwoodleaf,18,0
-pineleaves,18,1
-pineleaf,18,1
-pinetreeleaves,18,1
-pinelogleaves,18,1
-pinetrunkleaves,18,1
-pinewoodleaves,18,1
-ptreeleaves,18,1
-plogleaves,18,1
-ptrunkleaves,18,1
-pwoodleaves,18,1
-pitreeleaves,18,1
-pilogleaves,18,1
-pitrunkleaves,18,1
-piwoodleaves,18,1
-pinetreeleaf,18,1
-pinelogleaf,18,1
-pinetrunkleaf,18,1
-pinewoodleaf,18,1
-ptreeleaf,18,1
-plogleaf,18,1
-ptrunkleaf,18,1
-pwoodleaf,18,1
-pitreeleaf,18,1
-pilogleaf,18,1
-pitrunkleaf,18,1
-piwoodleaf,18,1
-birchleaves,18,2
-birchleaf,18,2
-birchtreeleaves,18,2
-birchlogleaves,18,2
-birchtrunkleaves,18,2
-birchwoodleaves,18,2
-btreeleaves,18,2
-blogleaves,18,2
-btrunkleaves,18,2
-bwoodleaves,18,2
-bitreeleaves,18,2
-bilogleaves,18,2
-bitrunkleaves,18,2
-biwoodleaves,18,2
-birchtreeleaf,18,2
-birchlogleaf,18,2
-birchtrunkleaf,18,2
-birchwoodleaf,18,2
-btreeleaf,18,2
-blogleaf,18,2
-btrunkleaf,18,2
-bwoodleaf,18,2
-bitreeleaf,18,2
-bilogleaf,18,2
-bitrunkleaf,18,2
-biwoodleaf,18,2
+leaves,18,4
+leaf,18,4
+treeleaves,18,4
+logleaves,18,4
+trunkleaves,18,4
+woodleaves,18,4
+oaktreeleaves,18,4
+oaklogleaves,18,4
+oaktrunkleaves,18,4
+oakwoodleaves,18,4
+normaltreeleaves,18,4
+normallogleaves,18,4
+normaltrunkleaves,18,4
+normalwoodleaves,18,4
+otreeleaves,18,4
+ologleaves,18,4
+otrunkleaves,18,4
+owoodleaves,18,4
+ntreeleaves,18,4
+nlogleaves,18,4
+ntrunkleaves,18,4
+nwoodleaves,18,4
+treeleaf,18,4
+logleaf,18,4
+trunkleaf,18,4
+woodleaf,18,4
+oaktreeleaf,18,4
+oaklogleaf,18,4
+oaktrunkleaf,18,4
+oakwoodleaf,18,4
+normaltreeleaf,18,4
+normallogleaf,18,4
+normaltrunkleaf,18,4
+normalwoodleaf,18,4
+otreeleaf,18,4
+ologleaf,18,4
+otrunkleaf,18,4
+owoodleaf,18,4
+ntreeleaf,18,4
+nlogleaf,18,4
+ntrunkleaf,18,4
+nwoodleaf,18,4
+pineleaves,18,5
+pineleaf,18,5
+pinetreeleaves,18,5
+pinelogleaves,18,5
+pinetrunkleaves,18,5
+pinewoodleaves,18,5
+ptreeleaves,18,5
+plogleaves,18,5
+ptrunkleaves,18,5
+pwoodleaves,18,5
+pitreeleaves,18,5
+pilogleaves,18,5
+pitrunkleaves,18,5
+piwoodleaves,18,5
+pinetreeleaf,18,5
+pinelogleaf,18,5
+pinetrunkleaf,18,5
+pinewoodleaf,18,5
+ptreeleaf,18,5
+plogleaf,18,5
+ptrunkleaf,18,5
+pwoodleaf,18,5
+pitreeleaf,18,5
+pilogleaf,18,5
+pitrunkleaf,18,5
+piwoodleaf,18,5
+birchleaves,18,6
+birchleaf,18,6
+birchtreeleaves,18,6
+birchlogleaves,18,6
+birchtrunkleaves,18,6
+birchwoodleaves,18,6
+btreeleaves,18,6
+blogleaves,18,6
+btrunkleaves,18,6
+bwoodleaves,18,6
+bitreeleaves,18,6
+bilogleaves,18,6
+bitrunkleaves,18,6
+biwoodleaves,18,6
+birchtreeleaf,18,6
+birchlogleaf,18,6
+birchtrunkleaf,18,6
+birchwoodleaf,18,6
+btreeleaf,18,6
+blogleaf,18,6
+btrunkleaf,18,6
+bwoodleaf,18,6
+bitreeleaf,18,6
+bilogleaf,18,6
+bitrunkleaf,18,6
+biwoodleaf,18,6
 sponge,19,0
 glass,20,0
 lapislazuliore,21,0

EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectBlockListener.java

@@ -85,7 +85,9 @@ public class EssentialsProtectBlockListener extends BlockListener
 			&& user.isAuthorized("essentials.protect"))
 		{
 			protect.add(blockPlaced);
-			if (prot.getSettingBool(ProtectConfig.protect_against_signs))
+			if (prot.getSettingBool(ProtectConfig.protect_against_signs)
+				&& event.getBlockAgainst().getType() != Material.SIGN_POST
+				&& event.getBlockAgainst().getType() != Material.WALL_SIGN)
 			{
 				protect.add(event.getBlockAgainst());
 			}