diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-03-01 22:37:15 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-03-01 22:37:15 +0000 |
| commit | 562288260267e4b6cdf40f31c9003ab16c096a95 (patch) | |
| tree | a38f305cf759dc1a8efecdbb3d4ffd7083266d09 | |
| parent | b3d3928db8b9d5cf28436980834b82d36658b6c1 (diff) | |
| parent | 6df3b9008a50922987c5100b17b400f9458d4a65 (diff) | |
| download | Essentials-562288260267e4b6cdf40f31c9003ab16c096a95.tar Essentials-562288260267e4b6cdf40f31c9003ab16c096a95.tar.gz Essentials-562288260267e4b6cdf40f31c9003ab16c096a95.tar.lz Essentials-562288260267e4b6cdf40f31c9003ab16c096a95.tar.xz Essentials-562288260267e4b6cdf40f31c9003ab16c096a95.zip | |
Merge branch 'master' of github.com:essentials/Essentialsstable-2.8.3
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignDisposal.java | 6 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignFree.java | 14 |
2 files changed, 14 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java b/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java index 77e6164e5..aa6376fa0 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java @@ -2,7 +2,6 @@ package com.earth2me.essentials.signs; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; -import org.bukkit.event.inventory.InventoryType; public class SignDisposal extends EssentialsSign @@ -15,7 +14,10 @@ public class SignDisposal extends EssentialsSign @Override protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) { - player.getBase().openInventory(ess.getServer().createInventory(player, InventoryType.CHEST)); + player.sendMessage("Bukkit broke this sign :("); + //TODO: wait for a fix in bukkit + //Problem: Items can be duplicated + //player.getBase().openInventory(ess.getServer().createInventory(player, 36)); return true; } } diff --git a/Essentials/src/com/earth2me/essentials/signs/SignFree.java b/Essentials/src/com/earth2me/essentials/signs/SignFree.java index a69b4155f..f5f32c38c 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignFree.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignFree.java @@ -4,6 +4,7 @@ import static com.earth2me.essentials.I18n._; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.Trade; import com.earth2me.essentials.User; +import com.earth2me.essentials.craftbukkit.InventoryWorkaround; import org.bukkit.Material; import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; @@ -33,10 +34,15 @@ public class SignFree extends EssentialsSign throw new SignException(_("cantSpawnItem", "Air")); } - item.setAmount(item.getType().getMaxStackSize() * 9 * 4); - Inventory i = ess.getServer().createInventory(player, InventoryType.CHEST); - i.addItem(item); - player.openInventory(i); + item.setAmount(item.getType().getMaxStackSize()); + InventoryWorkaround.addItem(player.getInventory(), true, item); + player.sendMessage("Item added to your inventory."); + player.updateInventory(); + //TODO: wait for a fix in bukkit + //Problem: Items can be duplicated + //Inventory i = ess.getServer().createInventory(player, InventoryType.CHEST); + //i.addItem(item); + //player.openInventory(i); Trade.log("Sign", "Free", "Interact", username, null, username, new Trade(item, ess), sign.getBlock().getLocation(), ess); return true; } |