SPIGOT-2000: Picking up items to shield slot working inconsistently when inventory is full

This commit is contained in:
PurkkaKoodari
2019-06-06 01:32:32 +03:00
committed by md_5
parent 7cc7719ffd
commit b7db6fba12
3 changed files with 26 additions and 0 deletions

View File

@@ -85,6 +85,12 @@
+ }
+ if (remains <= 0) return itemstack.getCount();
+ }
+ ItemStack offhandItemStack = this.getItem(this.items.size() + this.armor.size());
+ if (this.a(offhandItemStack, itemstack)) {
+ remains -= (offhandItemStack.getMaxStackSize() < this.getMaxStackSize() ? offhandItemStack.getMaxStackSize() : this.getMaxStackSize()) - offhandItemStack.getCount();
+ }
+ if (remains <= 0) return itemstack.getCount();
+
+ return itemstack.getCount() - remains;
+ }
+ // CraftBukkit end