summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-21 16:37:37 +0000
committersnowleo <snowleo@e251c2fe-e539-e718-e476-b85c1f46cddb>2011-04-21 16:37:37 +0000
commit5fbee1f39e226ef4d5dfb24e5263117f59d8c6f5 (patch)
tree37b55a65ef6202a60ec36ab8a5b3dfbeac59b726
parente08bba4db388c7f80d6c264d21e566c3f10637a4 (diff)
downloadEssentials-5fbee1f39e226ef4d5dfb24e5263117f59d8c6f5.tar
Essentials-5fbee1f39e226ef4d5dfb24e5263117f59d8c6f5.tar.gz
Essentials-5fbee1f39e226ef4d5dfb24e5263117f59d8c6f5.tar.lz
Essentials-5fbee1f39e226ef4d5dfb24e5263117f59d8c6f5.tar.xz
Essentials-5fbee1f39e226ef4d5dfb24e5263117f59d8c6f5.zip
Fix item drop on trade signs, if player inventory is full.
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1257 e251c2fe-e539-e718-e476-b85c1f46cddb
-rw-r--r--Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
index afd3f4056..528b27d83 100644
--- a/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
+++ b/Essentials/src/com/earth2me/essentials/EssentialsEcoPlayerListener.java
@@ -94,7 +94,10 @@ public class EssentialsEcoPlayerListener extends PlayerListener
}
else if (i1 != null)
{
- user.getInventory().addItem(i1);
+ Map<Integer, ItemStack> leftOver = user.getInventory().addItem(i1);
+ for (ItemStack itemStack : leftOver.values()) {
+ user.getWorld().dropItem(user.getLocation(), itemStack);
+ }
user.updateInventory();
}
r1 = 0;
@@ -122,8 +125,12 @@ public class EssentialsEcoPlayerListener extends PlayerListener
if (m2)
user.giveMoney(q2);
- else
- user.getInventory().addItem(qi2);
+ else {
+ Map<Integer, ItemStack> leftOver = user.getInventory().addItem(qi2);
+ for (ItemStack itemStack : leftOver.values()) {
+ user.getWorld().dropItem(user.getLocation(), itemStack);
+ }
+ }
user.updateInventory();