Update TransactionListener.java
This commit is contained in:
parent
7553df9c12
commit
795650a373
|
|
@ -52,8 +52,8 @@ public class TransactionListener extends EventListener {
|
||||||
Block block = event.getClickedBlock();
|
Block block = event.getClickedBlock();
|
||||||
if (block == null || !Tag.WALL_SIGNS.isTagged(block.getType()))
|
if (block == null || !Tag.WALL_SIGNS.isTagged(block.getType()))
|
||||||
return;
|
return;
|
||||||
|
ShopHandler shopHandler = plugin.getShopHandler();
|
||||||
PlayerShop playerShop = plugin.getShopHandler().getShopBySignLocation(block.getLocation());
|
PlayerShop playerShop = shopHandler.getShopBySignLocation(block.getLocation());
|
||||||
if (playerShop == null)
|
if (playerShop == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
@ -69,9 +69,6 @@ public class TransactionListener extends EventListener {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ShopHandler shopHandler = plugin.getShopHandler();
|
|
||||||
|
|
||||||
// Failsafe. If we have a shopsign but no block cancel the event, log error save and unload the shop
|
// Failsafe. If we have a shopsign but no block cancel the event, log error save and unload the shop
|
||||||
if (!shopHandler.isShopMaterial(playerShop.getShopLocation().getBlock())) {
|
if (!shopHandler.isShopMaterial(playerShop.getShopLocation().getBlock())) {
|
||||||
Logger.error("We have a shop here but no connected container");
|
Logger.error("We have a shop here but no connected container");
|
||||||
|
|
@ -91,11 +88,11 @@ public class TransactionListener extends EventListener {
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ShopUtil.canManageShop(player, playerShop)) {
|
if (ShopUtil.canManageShop(player, playerShop)) {
|
||||||
if (player.isSneaking())
|
if (player.isSneaking()) {
|
||||||
|
event.setCancelled(true);
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
ShopManagementGui gui = new ShopManagementGui(player.getUniqueId(), playerShop);
|
ShopManagementGui gui = new ShopManagementGui(player.getUniqueId(), playerShop);
|
||||||
gui.open();
|
gui.open();
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user