diff options
author | snowleo <schneeleo@gmail.com> | 2011-09-20 05:44:50 -0700 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2011-09-20 05:44:50 -0700 |
commit | cffd84ee69ced95df93b97c5765da54ec13076b1 (patch) | |
tree | e5d24e8262833891108eaa866f06ed2dd26d4152 | |
parent | 48bc00a01dcfeed12246e0dc44179612c6d7dfab (diff) | |
parent | 4dc2d07e29fe8bb4f87542af9208ccd41e2257a1 (diff) | |
download | Essentials-cffd84ee69ced95df93b97c5765da54ec13076b1.tar Essentials-cffd84ee69ced95df93b97c5765da54ec13076b1.tar.gz Essentials-cffd84ee69ced95df93b97c5765da54ec13076b1.tar.lz Essentials-cffd84ee69ced95df93b97c5765da54ec13076b1.tar.xz Essentials-cffd84ee69ced95df93b97c5765da54ec13076b1.zip |
Merge pull request #24 from eXeC64/master
Fixed bug where players are unable to remove their own chest protection.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignProtection.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java index 1db607606..b9bbfb90f 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java @@ -183,14 +183,19 @@ public class SignProtection extends EssentialsSign SignProtectionState retstate = SignProtectionState.NOSIGN; for (SignProtectionState state : signs.values()) { - if (state == SignProtectionState.OWNER || state == SignProtectionState.ALLOWED) + + if (state == SignProtectionState.OWNER) { return state; } - if (state == SignProtectionState.NOT_ALLOWED) + if (state == SignProtectionState.ALLOWED) { retstate = state; } + else if (state == SignProtectionState.NOT_ALLOWED && retstate != SignProtectionState.ALLOWED) + { + retstate = state + } } return retstate; } |