diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-01-01 19:48:08 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-01-01 19:48:08 +0000 |
| commit | ca25c710107eac9e526c861b3d25fbbdc9813f60 (patch) | |
| tree | 13b00986174fba5a62c943e04ceeb28b432e8592 | |
| parent | b5e559ff66b5500e92d48c43429f92a8964e0faf (diff) | |
| download | Essentials-ca25c710107eac9e526c861b3d25fbbdc9813f60.tar Essentials-ca25c710107eac9e526c861b3d25fbbdc9813f60.tar.gz Essentials-ca25c710107eac9e526c861b3d25fbbdc9813f60.tar.lz Essentials-ca25c710107eac9e526c861b3d25fbbdc9813f60.tar.xz Essentials-ca25c710107eac9e526c861b3d25fbbdc9813f60.zip | |
Cleanup cleanup.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index f8e530548..6946bf4ae 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -568,26 +568,9 @@ public class EssentialsPlayerListener implements Listener { final User user = ess.getUser(event.getWhoClicked()); final InventoryHolder invHolder = top.getHolder(); - if (invHolder != null && invHolder instanceof HumanEntity) + if (invHolder != null && invHolder instanceof HumanEntity && user.isInvSee()) { - final User invOwner = ess.getUser((HumanEntity)invHolder); - - if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify") - || invOwner.isAuthorized("essentials.invsee.preventmodify") - || !invOwner.isOnline() - || (event.getSlot() > 3 && event.getSlot() < 9))) - { - event.setCancelled(true); - user.updateInventory(); - } - else - { - final ItemStack[] contents = - { - top.getItem(0), top.getItem(1), top.getItem(2), top.getItem(3) - }; - invOwner.getInventory().setArmorContents(contents); - } + event.setCancelled(true); } } } @@ -622,11 +605,6 @@ public class EssentialsPlayerListener implements Listener if (invHolder != null && invHolder instanceof HumanEntity) { final User user = ess.getUser(event.getPlayer()); - final ItemStack[] contents = - { - top.getItem(0), top.getItem(1), top.getItem(2), top.getItem(3), - }; - ((HumanEntity)invHolder).getInventory().setArmorContents(contents); user.setInvSee(false); } } |