Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-27 04:25:14 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a bug in bukkit (which changed ItemStacks in arguments)

Browse Source
This commit is contained in:
Acrobot 2012-06-25 17:16:41 +02:00
parent f67990ea48
commit 9ef6305a0a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
com/Acrobot/ChestShop/Shop/Shop.java
View File

@ -43,11 +43,10 @@ public class Shop {
public Shop(Container container, ItemStack stock, Sign sign) { public Shop(Container container, ItemStack stock, Sign sign) {
this.container = container; this.container = container;
this.owner = sign.getLine(NAME_LINE);
this.stock = stock;
this.sign = sign; this.sign = sign;
this.owner = sign.getLine(NAME_LINE);
this.stock = stock;
} }
public void buyFromPlayer(Player player) { public void buyFromPlayer(Player player) {
@ -114,8 +113,8 @@ public class Shop {
Economy.add(getOwnerAccount(), price); Economy.add(getOwnerAccount(), price);
Economy.subtract(playerName, price); Economy.subtract(playerName, price);
container.removeItem(stock); container.removeItem(stock.clone()); //Bad bukkit! You shouldn't change ItemStacks during the process!
InventoryUtil.add(stock, player.getInventory()); InventoryUtil.add(stock.clone(), player.getInventory());
player.updateInventory(); player.updateInventory();
@ -131,9 +130,11 @@ public class Shop {
if (container == null) { if (container == null) {
return NO_CHEST_DETECTED; return NO_CHEST_DETECTED;
} }
if (price == PriceUtil.NO_PRICE) { if (price == PriceUtil.NO_PRICE) {
return NO_SELLING_HERE; return NO_SELLING_HERE;
} }
if (!hasPermission(player, stock.getType(), false)) { if (!hasPermission(player, stock.getType(), false)) {
return NO_PERMISSION; return NO_PERMISSION;
} }
@ -169,9 +170,9 @@ public class Shop {
Economy.subtract(ownerAccount, price); Economy.subtract(ownerAccount, price);
Economy.add(player.getName(), price); Economy.add(player.getName(), price);
container.addItem(stock); container.addItem(stock.clone());
InventoryUtil.remove(stock, player.getInventory()); InventoryUtil.remove(stock.clone(), player.getInventory());
player.updateInventory(); player.updateInventory();
TransactionEvent event = new TransactionEvent(SELL, container, sign, player, this.owner, stock, price); TransactionEvent event = new TransactionEvent(SELL, container, sign, player, this.owner, stock, price);