SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix EntityPickupItemEvent getRemaining / PlayerInventory#canHold

Browse Source 
Without this change the calculation of fitting items was incorrect, so event.getRemaining() did return 0 when it should not be 0.

By: Brokkonaut <hannos17@gmx.de>
This commit is contained in:
CraftBukkit/Spigot
2019-02-12 04:49:24 +01:00
parent 773e44eee7
commit a6ec0de609
2 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
paper-server/src/test/java/org/bukkit/craftbukkit/inventory/PlayerInventoryTest.java Normal file
View File

@@ -0,0 +1,60 @@
package org.bukkit.craftbukkit.inventory;
import net.minecraft.server.ItemStack;
import net.minecraft.server.Items;
import net.minecraft.server.PlayerInventory;
import org.bukkit.support.AbstractTestingBase;
import org.junit.Test;
import static org.junit.Assert.*;
public class PlayerInventoryTest extends AbstractTestingBase {
@Test
public void testCanHold() throws Exception {
ItemStack itemStackApple = new ItemStack(Items.APPLE);
ItemStack itemStack1Coal = new ItemStack(Items.COAL);
ItemStack itemStack32Coal = new ItemStack(Items.COAL, 32);
ItemStack itemStack63Coal = new ItemStack(Items.COAL, 63);
ItemStack itemStack64Coal = new ItemStack(Items.COAL, 64);
// keep one slot empty
PlayerInventory inventory = new PlayerInventory(null);
for (int i = 0; i < inventory.items.size() - 1; i++) {
inventory.setItem(i, itemStackApple);
}
// one slot empty
assertEquals(1, inventory.canHold(itemStack1Coal));
assertEquals(32, inventory.canHold(itemStack32Coal));
assertEquals(64, inventory.canHold(itemStack64Coal));
// no free space with a stack of the item to check in the inventory
inventory.setItem(inventory.items.size() - 1, itemStack64Coal);
assertEquals(0, inventory.canHold(itemStack1Coal));
assertEquals(0, inventory.canHold(itemStack32Coal));
assertEquals(0, inventory.canHold(itemStack64Coal));
// no free space without a stack of the item to check in the inventory
inventory.setItem(inventory.items.size() - 1, itemStackApple);
assertEquals(0, inventory.canHold(itemStack1Coal));
assertEquals(0, inventory.canHold(itemStack32Coal));
assertEquals(0, inventory.canHold(itemStack64Coal));
// free space for 32 items in one slot
inventory.setItem(inventory.items.size() - 1, itemStack32Coal);
assertEquals(1, inventory.canHold(itemStack1Coal));
assertEquals(32, inventory.canHold(itemStack32Coal));
assertEquals(32, inventory.canHold(itemStack64Coal));
// free space for 1 item in two slots
inventory.setItem(inventory.items.size() - 1, itemStack63Coal);
inventory.setItem(inventory.items.size() - 2, itemStack63Coal);
assertEquals(1, inventory.canHold(itemStack1Coal));
assertEquals(2, inventory.canHold(itemStack32Coal));
assertEquals(2, inventory.canHold(itemStack64Coal));
}
}