Merge branch 'master' into release

This commit is contained in:
snowleo 2011-10-04 21:34:28 +02:00
commit 4f85751694

View File

@ -223,7 +223,7 @@ public class EssentialsSign
if (signblock.getType() == Material.WALL_SIGN) if (signblock.getType() == Material.WALL_SIGN)
{ {
final org.bukkit.material.Sign signMat = (org.bukkit.material.Sign)signblock.getState().getData(); final org.bukkit.material.Sign signMat = (org.bukkit.material.Sign)signblock.getState().getData();
if (signMat.getFacing() == blockFace && isValidSign(new BlockSign(signblock))) if (signMat != null && signMat.getFacing() == blockFace && isValidSign(new BlockSign(signblock)))
{ {
return true; return true;
} }