Merge branch '1.12' into 1.13

This commit is contained in:
Phoenix616 2018-09-26 17:02:21 +01:00
commit 26d800132c

View File

@ -102,8 +102,10 @@ public class PlayerInteract implements Listener {
return; return;
} }
if (canAccess) { if (canAccess && !ChestShopSign.isAdminShop(sign)) {
if (!Properties.ALLOW_SIGN_CHEST_OPEN || player.isSneaking() || player.isInsideVehicle() || player.getGameMode() == GameMode.CREATIVE) { if (!Properties.ALLOW_SIGN_CHEST_OPEN
|| player.isSneaking() || player.isInsideVehicle()
|| (Properties.IGNORE_CREATIVE_MODE && player.getGameMode() == GameMode.CREATIVE)) {
return; return;
} }