502647092/QuickShop
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/QuickShop.git synced 2025-10-02 12:37:27 +00:00
Code Releases Activity

feat: 修复一个在删除商店时导致的报错

Browse Source 
Signed-off-by: 502647092 <admin@yumc.pw>
This commit is contained in:
502647092
2016-07-16 11:42:40 +08:00
parent 665d6d77d1
commit b10c601ce7
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/maxgamer/QuickShop/Listeners/PlayerListener.java
View File

@ -43,7 +43,7 @@ public class PlayerListener implements Listener {
public void onClick(final PlayerInteractEvent e) {
final Block b = e.getClickedBlock();
final Player p = e.getPlayer();
if (e.getAction() != Action.LEFT_CLICK_BLOCK || (e.getMaterial() == plugin.getConfigManager().getSuperItem() && b.getType() == Material.WALL_SIGN)) {
if (e.getAction() != Action.LEFT_CLICK_BLOCK || (e.getMaterial() == plugin.getConfigManager().getSuperItem() && (b.getType() == Material.WALL_SIGN || p.getGameMode() == GameMode.CREATIVE))) {
return;
}
final Location loc = b.getLocation();
@ -74,12 +74,7 @@ public class PlayerListener implements Listener {
return;
}
// Handles creating shops
else if (shop == null
&& item != null
&& item.getType() != Material.AIR
&& p.hasPermission("quickshop.create.sell")
&& Util.canBeShop(b)
&& p.getGameMode() != GameMode.CREATIVE
else if (shop == null && item != null && item.getType() != Material.AIR && p.hasPermission("quickshop.create.sell") && Util.canBeShop(b) && p.getGameMode() != GameMode.CREATIVE
&& (plugin.getConfigManager().isSneakCreate() == p.isSneaking())) {
if (!plugin.getShopManager().canBuildShop(p, b, e.getBlockFace())) {
// As of the new checking system, most plugins will tell the
@ -169,6 +164,7 @@ public class PlayerListener implements Listener {
final Block attached = Util.getAttached(b);
final Shop shop = attached == null ? null : plugin.getShopManager().getShop(attached.getLocation());
if (shop != null) {
e.setCancelled(true);
final Location loc = shop.getLocation();
String shopmode = "";
if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {