summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <md_5@bigpond.com>2012-03-15 20:48:41 +1100
committermd_5 <md_5@bigpond.com>2012-03-15 20:48:55 +1100
commitdc5fac37897c2ba82e8e0423aea5f6af52162124 (patch)
tree1e07be0458c5d14304e80aef98f577ed14d5b11e
parentcf41172f3346408dcf534a4227d4c3ad6cc398d9 (diff)
downloadEssentials-dc5fac37897c2ba82e8e0423aea5f6af52162124.tar
Essentials-dc5fac37897c2ba82e8e0423aea5f6af52162124.tar.gz
Essentials-dc5fac37897c2ba82e8e0423aea5f6af52162124.tar.lz
Essentials-dc5fac37897c2ba82e8e0423aea5f6af52162124.tar.xz
Essentials-dc5fac37897c2ba82e8e0423aea5f6af52162124.zip
Restore [free] and [disposal] signs back to their intended behaviour
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignDisposal.java5
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/SignFree.java11
2 files changed, 4 insertions, 12 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java b/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java
index aa6376fa0..f44c6177a 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignDisposal.java
@@ -14,10 +14,7 @@ public class SignDisposal extends EssentialsSign
@Override
protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess)
{
- 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));
+ 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 f5f32c38c..c7adec307 100644
--- a/Essentials/src/com/earth2me/essentials/signs/SignFree.java
+++ b/Essentials/src/com/earth2me/essentials/signs/SignFree.java
@@ -35,14 +35,9 @@ public class SignFree extends EssentialsSign
}
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);
+ 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;
}