Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 18:27:41 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4031: Improve bounds checking in CraftInventoryView.

Browse Source 
By: Hex <hex@hex.lc>
This commit is contained in:
CraftBukkit/Spigot 2018-07-16 22:47:47 -06:00
parent 11239259a0
commit ac0ac69ea5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryView.java
View File

@ -50,7 +50,7 @@ public class CraftInventoryView extends InventoryView {
@Override @Override
public void setItem(int slot, ItemStack item) { public void setItem(int slot, ItemStack item) {
net.minecraft.server.ItemStack stack = CraftItemStack.asNMSCopy(item); net.minecraft.server.ItemStack stack = CraftItemStack.asNMSCopy(item);
if (slot != -999) { if (slot >= 0) {
container.getSlot(slot).set(stack); container.getSlot(slot).set(stack);
} else { } else {
player.getHandle().drop(stack, false); player.getHandle().drop(stack, false);
@ -59,7 +59,7 @@ public class CraftInventoryView extends InventoryView {
@Override @Override
public ItemStack getItem(int slot) { public ItemStack getItem(int slot) {
if (slot == -999) { if (slot < 0) {
return null; return null;
} }
return CraftItemStack.asCraftMirror(container.getSlot(slot).getItem()); return CraftItemStack.asCraftMirror(container.getSlot(slot).getItem());
@ -125,7 +125,7 @@ public class CraftInventoryView extends InventoryView {
// Nothing to do, it's a CONTAINER slot // Nothing to do, it's a CONTAINER slot
} }
} else { } else {
if (slot == -999 || slot == -1) { if (slot < 0) {
type = SlotType.OUTSIDE; type = SlotType.OUTSIDE;
} else if (inventory.getType() == InventoryType.CRAFTING) { // Also includes creative inventory } else if (inventory.getType() == InventoryType.CRAFTING) { // Also includes creative inventory
if (slot < 9) { if (slot < 9) {