Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-12-25 09:27:39 +01:00
Code Issues Projects Releases Wiki Activity

Fixed errors in PlayerInventoryListener

Browse Source
This commit is contained in:
Acrobot 2012-11-23 21:03:29 +01:00
parent 22c5e20703
commit 0d22ddc4a4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
com/Acrobot/ChestShop/Listeners/Player/PlayerInventory.java
View File

@ -1,6 +1,7 @@
package com.Acrobot.ChestShop.Listeners.Player; package com.Acrobot.ChestShop.Listeners.Player;
import com.Acrobot.ChestShop.Config.Config; import com.Acrobot.ChestShop.Configuration.Messages;
import com.Acrobot.ChestShop.Configuration.Properties;
import com.Acrobot.ChestShop.Plugins.ChestShop; import com.Acrobot.ChestShop.Plugins.ChestShop;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
@ -13,9 +14,6 @@ import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
import static com.Acrobot.ChestShop.Config.Language.ACCESS_DENIED;
import static com.Acrobot.ChestShop.Config.Property.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY;
/** /**
* @author Acrobot * @author Acrobot
*/ */
@ -26,7 +24,7 @@ public class PlayerInventory implements Listener {
return; return;
} }
if (!Config.getBoolean(TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY)) { if (!Properties.TURN_OFF_DEFAULT_PROTECTION_WHEN_PROTECTED_EXTERNALLY) {
return; return;
} }
@ -37,10 +35,16 @@ public class PlayerInventory implements Listener {
} }
Player player = (Player) entity; Player player = (Player) entity;
Block chest = ((BlockState) event.getInventory().getHolder()).getBlock(); Block chest;
if (event.getInventory().getHolder() instanceof Chest) {
chest = ((BlockState) event.getInventory().getHolder()).getBlock();
} else {
chest = ((DoubleChest) event.getInventory().getHolder()).getLocation().getBlock();
}
if (!PlayerInteract.canOpenOtherShops(player) && !ChestShop.canAccess(player, chest)) { if (!PlayerInteract.canOpenOtherShops(player) && !ChestShop.canAccess(player, chest)) {
player.sendMessage(Config.getLocal(ACCESS_DENIED)); player.sendMessage(Messages.prefix(Messages.ACCESS_DENIED));
event.setCancelled(true); event.setCancelled(true);
} }
} }