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 | 7ac5ec117744f996b6626de870f32b380b544a12 (patch) | |
| tree | 7efa64d503c8301c8951545fa707b538e3af84f8 | |
| parent | 9803a0efe4aea82407e4f4bcd25fdd4897c70d2c (diff) | |
| parent | 630a1493923267a344bda93552a7f3f111630722 (diff) | |
| download | Essentials-7ac5ec117744f996b6626de870f32b380b544a12.tar Essentials-7ac5ec117744f996b6626de870f32b380b544a12.tar.gz Essentials-7ac5ec117744f996b6626de870f32b380b544a12.tar.lz Essentials-7ac5ec117744f996b6626de870f32b380b544a12.tar.xz Essentials-7ac5ec117744f996b6626de870f32b380b544a12.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; } |