diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-05-06 23:30:55 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-05-06 23:30:55 +0100 |
commit | d9e15729fd9fcce20984ffc64327c944e3c39514 (patch) | |
tree | 5b5f2bffb95a8f0cf7551ff782ba82bc132802a7 | |
parent | 0fbe2da9cb1a937e52b0086ee6f59c27933cd194 (diff) | |
download | Essentials-d9e15729fd9fcce20984ffc64327c944e3c39514.tar Essentials-d9e15729fd9fcce20984ffc64327c944e3c39514.tar.gz Essentials-d9e15729fd9fcce20984ffc64327c944e3c39514.tar.lz Essentials-d9e15729fd9fcce20984ffc64327c944e3c39514.tar.xz Essentials-d9e15729fd9fcce20984ffc64327c944e3c39514.zip |
Revert "/me crashes ementalo's face for making the client crash."
This reverts commit 6d1e2dd10eb38ad4ad582a633f80e1e8443174c9.
And fix the original bug.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java index 589c1eb38..1b4f461c4 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java @@ -417,7 +417,9 @@ public class EssentialsPlayerListener implements Listener if (event.getView().getTopInventory().getType() == InventoryType.PLAYER) { final User user = ess.getUser(event.getWhoClicked()); - if (user.isInvSee() && !user.isAuthorized("essentials.invsee.modify")) + final User invOwner = ess.getUser(event.getView().getPlayer()); + if (user.isInvSee() && (!user.isAuthorized("essentials.invsee.modify") + || invOwner.isAuthorized("essentials.invsee.preventmodify"))) { event.setCancelled(true); } |