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

Merge pull request #64 from LukBukkit/master 

Fixed an error when trading with a admin shop (Fixes #59, #63 & DevBukkit #1219)
This commit is contained in:
Max Lee 2017-08-27 16:16:11 +01:00 committed by GitHub
parent 7199acb8ef e672dc5e22
commit 3434c8860c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
View File

@ -30,8 +30,6 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import java.util.UUID;
import static com.Acrobot.Breeze.Utils.BlockUtil.isChest;
import static com.Acrobot.Breeze.Utils.BlockUtil.isSign;
import static com.Acrobot.ChestShop.Events.TransactionEvent.TransactionType;
@ -117,19 +115,25 @@ public class PlayerInteract implements Listener {
if (account == null)
return null;
OfflinePlayer owner = account.getUuid().version() != 4 // it seems to forget the username when getting by the offline UUID
? Bukkit.getOfflinePlayer(account.getName()) // so we get the OfflinePlayer directly by the name in this case
boolean adminShop = ChestShopSign.isAdminShop(sign);
// It seems to forget the username when getting by the offline UUID
// so we get the OfflinePlayer directly by the name in this case.
// We're also getting the OfflinePlayer of the admin shop by its
// name, because it will be also sometimes forgotten.
OfflinePlayer owner = account.getUuid().version() != 4 || adminShop
? Bukkit.getOfflinePlayer(account.getName())
: Bukkit.getOfflinePlayer(account.getUuid());
// check if player exists in economy
if(!ChestShopSign.isAdminShop(sign) && (owner == null || owner.getName() == null || !VaultListener.getProvider().hasAccount(owner)))
if(!adminShop && (owner == null || owner.getName() == null || !VaultListener.getProvider().hasAccount(owner)))
return null;
Action buy = Properties.REVERSE_BUTTONS ? LEFT_CLICK_BLOCK : RIGHT_CLICK_BLOCK;
double price = (action == buy ? PriceUtil.getBuyPrice(prices) : PriceUtil.getSellPrice(prices));
Chest chest = uBlock.findConnectedChest(sign);
Inventory ownerInventory = (ChestShopSign.isAdminShop(sign) ? new AdminInventory() : chest != null ? chest.getInventory() : null);
Inventory ownerInventory = (adminShop ? new AdminInventory() : chest != null ? chest.getInventory() : null);
ItemStack item = MaterialUtil.getItem(material);
if (item == null || !NumberUtil.isInteger(quantity)) {