Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-24 03:25:15 +01:00
Code Issues Projects Releases Wiki Activity

Fix some improper item cloning instances that would have dropped enchantments

Browse Source
This commit is contained in:
Celtic Minstrel 2012-03-13 20:50:36 -04:00 committed by EvilSeph
parent 77ceb0002c
commit f27427ad19
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@ -68,8 +68,8 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
} }
public void setItemOnCursor(ItemStack item) { public void setItemOnCursor(ItemStack item) {
CraftItemStack stack = new CraftItemStack(item.getType(), item.getAmount(), item.getDurability()); CraftItemStack stack = new CraftItemStack(item);
getHandle().inventory.setCarried(stack.getType() == Material.AIR ? null : stack.getHandle()); getHandle().inventory.setCarried(stack.getHandle());
if (this instanceof CraftPlayer) { if (this instanceof CraftPlayer) {
((EntityPlayer) getHandle()).broadcastCarriedItem(); // Send set slot for cursor ((EntityPlayer) getHandle()).broadcastCarriedItem(); // Send set slot for cursor
} }

2
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
View File

@ -266,7 +266,7 @@ public class CraftInventory implements Inventory {
} else { } else {
// More than a single stack! // More than a single stack!
if (item.getAmount() > getMaxItemStack()) { if (item.getAmount() > getMaxItemStack()) {
CraftItemStack stack = new CraftItemStack(item.getTypeId(), getMaxItemStack(), item.getDurability()); CraftItemStack stack = new CraftItemStack(item);
stack.addUnsafeEnchantments(item.getEnchantments()); stack.addUnsafeEnchantments(item.getEnchantments());
setItem(firstFree, stack); setItem(firstFree, stack);
item.setAmount(item.getAmount() - getMaxItemStack()); item.setAmount(item.getAmount() - getMaxItemStack());

2
src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCrafting.java
View File

@ -114,7 +114,7 @@ public class CraftInventoryCrafting extends CraftInventory implements CraftingIn
if (item == null || item.getTypeId() <= 0) { if (item == null || item.getTypeId() <= 0) {
mcItems[i] = null; mcItems[i] = null;
} else { } else {
mcItems[i] = new net.minecraft.server.ItemStack( item.getTypeId(), item.getAmount(), item.getDurability()); mcItems[i] = CraftItemStack.createNMSItemStack(item);
} }
} else { } else {
mcItems[i] = null; mcItems[i] = null;