diff options
| author | Chris Ward <chris@chrisgward.com> | 2013-01-09 01:07:14 +1100 |
|---|---|---|
| committer | Chris Ward <chris@chrisgward.com> | 2013-01-09 01:07:14 +1100 |
| commit | 9f5ea1bd39d8505b765d6ece6ed0c324d981f107 (patch) | |
| tree | 835a3ffcac2363c50f750bd118581072eeb52633 | |
| parent | 9b58760bb4909b769a003a918be02dd4ab18174b (diff) | |
| download | Essentials-9f5ea1bd39d8505b765d6ece6ed0c324d981f107.tar Essentials-9f5ea1bd39d8505b765d6ece6ed0c324d981f107.tar.gz Essentials-9f5ea1bd39d8505b765d6ece6ed0c324d981f107.tar.lz Essentials-9f5ea1bd39d8505b765d6ece6ed0c324d981f107.tar.xz Essentials-9f5ea1bd39d8505b765d6ece6ed0c324d981f107.zip | |
Fix compilation. Finish InventoryWorkaround update.
| -rw-r--r-- | Essentials/src/net/ess3/commands/Commandunlimited.java | 5 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/user/User.java | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Essentials/src/net/ess3/commands/Commandunlimited.java b/Essentials/src/net/ess3/commands/Commandunlimited.java index a1d978728..c33c7ec6b 100644 --- a/Essentials/src/net/ess3/commands/Commandunlimited.java +++ b/Essentials/src/net/ess3/commands/Commandunlimited.java @@ -90,9 +90,10 @@ public class Commandunlimited extends EssentialsCommand { message = "enableUnlimited"; enableUnlimited = true; - if (!InventoryWorkaround.containsItem(target.getPlayer().getInventory(), true, true, stack)) + + if (!target.getPlayer().getInventory().contains(stack)) { - InventoryWorkaround.addItem(target.getPlayer().getInventory(), false, stack); + InventoryWorkaround.addItems(target.getPlayer().getInventory(), stack); } } diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java index e3523c7fd..b21a00cf6 100644 --- a/Essentials/src/net/ess3/user/User.java +++ b/Essentials/src/net/ess3/user/User.java @@ -542,11 +542,11 @@ public class User extends UserBase implements IUser final ISettings settings = ess.getSettings(); int oversizedStackSize = settings.getData().getGeneral().getOversizedStacksize(); - overfilled = InventoryWorkaround.addItem(getPlayer().getInventory(), true, oversizedStackSize, itemStack); + overfilled = InventoryWorkaround.addOversizedItems(getPlayer().getInventory(), oversizedStackSize, itemStack); } else { - overfilled = InventoryWorkaround.addItem(getPlayer().getInventory(), true, itemStack); + overfilled = InventoryWorkaround.addItems(getPlayer().getInventory(), itemStack); } if (canSpew) { |