From e8c2aa9d07ba891455586796981e645a9130c263 Mon Sep 17 00:00:00 2001 From: AppleDash Date: Sun, 23 Oct 2016 14:11:31 -0400 Subject: [PATCH] Fix a bug in output when a shop is created. --- .../saneeconomysignshop/listeners/InteractListener.java | 2 +- .../saneeconomysignshop/listeners/SignChangeListener.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/InteractListener.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/InteractListener.java index 830f10b..f23a4b8 100644 --- a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/InteractListener.java +++ b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/InteractListener.java @@ -40,7 +40,7 @@ public class InteractListener implements Listener { return; } - if (evt.getPlayer().getInventory().getItemInMainHand() != null && evt.getPlayer().getInventory().getItemInMainHand().getType() == Material.DIAMOND_AXE) { + if ((evt.getPlayer().getInventory().getItemInMainHand() != null) && (evt.getPlayer().getInventory().getItemInMainHand().getType() == Material.DIAMOND_AXE)) { return; } diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java index 50ec377..9313bf6 100644 --- a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java +++ b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java @@ -49,14 +49,14 @@ public class SignChangeListener implements Listener { MessageUtils.sendMessage(evt.getPlayer(), "Sign shop created!"); MessageUtils.sendMessage(evt.getPlayer(), String.format("Item: %d x %s", signShop.getQuantity(), signShop.getItem())); - if (signShop.canBuy()) { - MessageUtils.sendMessage(evt.getPlayer(), String.format("Will buy from players for %s.", + if (signShop.canBuy()) { // The player be buying from the shop, not the other way around. + MessageUtils.sendMessage(evt.getPlayer(), String.format("Will sell too players for %s.", plugin.getSaneEconomy().getEconomyManager().getCurrency().formatAmount(signShop.getBuyPrice()) )); } - if (signShop.canSell()) { - MessageUtils.sendMessage(evt.getPlayer(), String.format("Will sell to players for %s.", + if (signShop.canSell()) { // The player be selling to the shop, not the other way around. + MessageUtils.sendMessage(evt.getPlayer(), String.format("Will buy from players for %s.", plugin.getSaneEconomy().getEconomyManager().getCurrency().formatAmount(signShop.getSellPrice()) )); }