OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 04:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix creative ArrayIndexOutOfBoundsException. Fixes BUKKIT-4305

Browse source 
When a Player drops an ItemStack while in creative mode by placing it outside
of their inventory window, the slot number in the packet is -1. The check
that was added to avoid throwing InventoryCreativeEvent excessively didn't
take this into account, and would cause an ArrayIndexOutOfBoundsException to
be thrown when attempting to get the slot specified by the packet.

This change shorts the invocation of player.defaultContainer.getSlot(
packet107setcreativeslot.b) to only occur if the slot id is within the range
of the Inventory.  This prevents attempting to get the slot from a location
that is actually outside of the Inventory.
This commit is contained in:
Nate Mortensen 2013-06-04 10:44:44 -06:00 committed by Wesley Wolfe
parent 991218a339
commit bf4796d39e
1 changed files with 29 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/main/java/net/minecraft/server/PlayerConnection.java
View file

@ -1459,45 +1459,41 @@ public class PlayerConnection extends Connection {
boolean flag3 = itemstack == null || itemstack.getData() >= 0 && itemstack.getData() >= 0 && itemstack.count <= 64 && itemstack.count > 0; boolean flag3 = itemstack == null || itemstack.getData() >= 0 && itemstack.getData() >= 0 && itemstack.count <= 64 && itemstack.count > 0;
// CraftBukkit start - Call click event // CraftBukkit start - Call click event
if (flag1 || flag) { // Insist on valid slot if (flag || (flag1 && !ItemStack.matches(this.player.defaultContainer.getSlot(packet107setcreativeslot.slot).getItem(), packet107setcreativeslot.b))) { // Insist on valid slot
ItemStack existingItem = this.player.defaultContainer.getSlot(packet107setcreativeslot.slot).getItem();
// Client assumes that the server forgets the contents of the inventory. It doesn't.
if (!ItemStack.matches(existingItem, packet107setcreativeslot.b)) {
org.bukkit.entity.HumanEntity player = this.player.getBukkitEntity(); org.bukkit.entity.HumanEntity player = this.player.getBukkitEntity();
InventoryView inventory = new CraftInventoryView(player, player.getInventory(), this.player.defaultContainer); InventoryView inventory = new CraftInventoryView(player, player.getInventory(), this.player.defaultContainer);
org.bukkit.inventory.ItemStack item = CraftItemStack.asBukkitCopy(packet107setcreativeslot.b); // Should be packet107setcreativeslot.newitem org.bukkit.inventory.ItemStack item = CraftItemStack.asBukkitCopy(packet107setcreativeslot.b); // Should be packet107setcreativeslot.newitem
SlotType type = SlotType.QUICKBAR; SlotType type = SlotType.QUICKBAR;
if (flag) { if (flag) {
type = SlotType.OUTSIDE; type = SlotType.OUTSIDE;
} else if (packet107setcreativeslot.slot < 36) { } else if (packet107setcreativeslot.slot < 36) {
if (packet107setcreativeslot.slot >= 5 && packet107setcreativeslot.slot < 9) { if (packet107setcreativeslot.slot >= 5 && packet107setcreativeslot.slot < 9) {
type = SlotType.ARMOR; type = SlotType.ARMOR;
} else { } else {
type = SlotType.CONTAINER; type = SlotType.CONTAINER;
}
} }
InventoryCreativeEvent event = new InventoryCreativeEvent(inventory, type, flag ? -999 : packet107setcreativeslot.slot, item); }
server.getPluginManager().callEvent(event); InventoryCreativeEvent event = new InventoryCreativeEvent(inventory, type, flag ? -999 : packet107setcreativeslot.slot, item);
server.getPluginManager().callEvent(event);
itemstack = CraftItemStack.asNMSCopy(event.getCursor()); itemstack = CraftItemStack.asNMSCopy(event.getCursor());
switch (event.getResult()) { switch (event.getResult()) {
case ALLOW: case ALLOW:
// Plugin cleared the id / stacksize checks // Plugin cleared the id / stacksize checks
flag2 = flag3 = true; flag2 = flag3 = true;
break; break;
case DEFAULT: case DEFAULT:
break; break;
case DENY: case DENY:
// Reset the slot // Reset the slot
if (packet107setcreativeslot.slot >= 0) { if (packet107setcreativeslot.slot >= 0) {
this.player.playerConnection.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, packet107setcreativeslot.slot, this.player.defaultContainer.getSlot(packet107setcreativeslot.slot).getItem())); this.player.playerConnection.sendPacket(new Packet103SetSlot(this.player.defaultContainer.windowId, packet107setcreativeslot.slot, this.player.defaultContainer.getSlot(packet107setcreativeslot.slot).getItem()));
this.player.playerConnection.sendPacket(new Packet103SetSlot(-1, -1, null)); this.player.playerConnection.sendPacket(new Packet103SetSlot(-1, -1, null));
}
return;
} }
return;
} }
} }
// CraftBukkit end // CraftBukkit end