diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-09-20 15:13:08 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-09-20 15:13:08 +0100 |
| commit | 9c998eac2f71dab4fdc89fca5fe33aafff5e0869 (patch) | |
| tree | 689af740d89cab5766c32773bb4c60e958aaa6c9 | |
| parent | 2bdc00dc143695f8b24c237bdee8389faf5ea0aa (diff) | |
| parent | 83e8dac6a04dee52d8be7e5d53eedff3b67f3238 (diff) | |
| download | Essentials-9c998eac2f71dab4fdc89fca5fe33aafff5e0869.tar Essentials-9c998eac2f71dab4fdc89fca5fe33aafff5e0869.tar.gz Essentials-9c998eac2f71dab4fdc89fca5fe33aafff5e0869.tar.lz Essentials-9c998eac2f71dab4fdc89fca5fe33aafff5e0869.tar.xz Essentials-9c998eac2f71dab4fdc89fca5fe33aafff5e0869.zip | |
Merge branch 'master' of github.com:essentials/Essentials into essmaster
| -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..81c95f8b8 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java @@ -183,11 +183,16 @@ 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; } |