Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-25 18:48:24 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup cleanup.

Browse Source
This commit is contained in:
KHobbits 2013-01-01 19:48:08 +00:00
parent b5e559ff66
commit ca25c71010
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -568,26 +568,9 @@ public class EssentialsPlayerListener implements Listener
{ {
final User user = ess.getUser(event.getWhoClicked()); final User user = ess.getUser(event.getWhoClicked());
final InventoryHolder invHolder = top.getHolder(); 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); event.setCancelled(true);
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);
}
} }
} }
} }
@ -622,11 +605,6 @@ public class EssentialsPlayerListener implements Listener
if (invHolder != null && invHolder instanceof HumanEntity) if (invHolder != null && invHolder instanceof HumanEntity)
{ {
final User user = ess.getUser(event.getPlayer()); 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); user.setInvSee(false);
} }
} }