Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed the last merge

This commit is contained in:
Acrobot 2012-04-07 12:44:58 +02:00
parent 12cc59aa35
commit 77aa60d2a2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com/Acrobot/ChestShop/Config/Property.java
View File

@ -38,7 +38,7 @@ public enum Property {
SHOP_INTERACTION_INTERVAL(100, "(In 1/1000th of a second) How often can a player use a shop sign?"),
HEROES_EXP(100, "How much Heroes exp should people get for creating a ChestShop?"),
BLOCK_UPDATE(false, "EXPERIMENTAL: Should every ChestShop transaction result in a block update?"),
ALLOW_PARTIAL_TRANSACTIONS(true, "Can shops be used even when the seller doesn't have enough items? (The price will be scaled adequatly to the item amount)");
ALLOW_PARTIAL_TRANSACTIONS(true, "Can shops be used even when the seller doesn't have enough items? (The price will be scaled adequatly to the item amount)"),
ALLOW_SIGN_CHEST_OPEN(true, "Can shop's chest be opened by owner with right-clicking a shop's sign?");

10
com/Acrobot/ChestShop/Listeners/playerInteract.java
View File

@ -64,8 +64,14 @@ public class playerInteract implements Listener {
if (action == Action.RIGHT_CLICK_BLOCK) event.setCancelled(true);
if (Config.getBoolean(Property.ALLOW_SIGN_CHEST_OPEN) && uSign.canAccess(player, sign)) {
if (action != Action.LEFT_CLICK_BLOCK || !Config.getBoolean(Property.ALLOW_LEFT_CLICK_DESTROYING)) showChestGUI(player, block);
if (uSign.canAccess(player, sign)) {
if (!Config.getBoolean(Property.ALLOW_SIGN_CHEST_OPEN)) {
return;
}
if (action != Action.LEFT_CLICK_BLOCK || !Config.getBoolean(Property.ALLOW_LEFT_CLICK_DESTROYING)) {
showChestGUI(player, block);
}
return;
}