diff options
author | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-01 22:06:00 +0000 |
---|---|---|
committer | snowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb> | 2011-04-01 22:06:00 +0000 |
commit | 3c59ec9c5862493543b0fa0efe96c7ed2354d05e (patch) | |
tree | 3cf92f7419d2e852ddc22fd3f91a020f36ee3d95 /EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java | |
parent | 1e45b468dc4cb5ce78bb7cf666a14b217df7ea29 (diff) | |
download | Essentials-3c59ec9c5862493543b0fa0efe96c7ed2354d05e.tar Essentials-3c59ec9c5862493543b0fa0efe96c7ed2354d05e.tar.gz Essentials-3c59ec9c5862493543b0fa0efe96c7ed2354d05e.tar.lz Essentials-3c59ec9c5862493543b0fa0efe96c7ed2354d05e.tar.xz Essentials-3c59ec9c5862493543b0fa0efe96c7ed2354d05e.zip |
[trunk] Item lists in settings are now stored as Integer lists.
Also: Names from items.csv now work in item lists.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1084 e251c2fe-e539-e718-e476-b85c1f46cddb
Diffstat (limited to 'EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java')
-rw-r--r-- | EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java index 0c9cddec5..f8ef85cc7 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectPlayerListener.java @@ -45,11 +45,11 @@ public class EssentialsProtectPlayerListener extends PlayerListener } - if (item != null && EssentialsProtect.checkProtectionItems(EssentialsProtect.usageList, item.getTypeId()) && !user.isAuthorized("essentials.protect.exemptusage")) - { - event.setCancelled(true); - return; - } + if (item != null && EssentialsProtect.checkProtectionItems(EssentialsProtect.usageList, item.getTypeId()) && !user.isAuthorized("essentials.protect.exemptusage")) + { + event.setCancelled(true); + return; + } if (user.isAuthorized("essentials.protect.admin")) { @@ -61,7 +61,7 @@ public class EssentialsProtectPlayerListener extends PlayerListener + ownerName); } } - if (item != null && EssentialsProtect.onUseAlert.contains(String.valueOf(item.getTypeId()))) + if (item != null && EssentialsProtect.checkProtectionItems(EssentialsProtect.onUseAlert, item.getTypeId())) { parent.alert(user, item.getType().toString(), "used: "); } |