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

Implement ItemFactory and ItemMeta values. Adds BUKKIT-15

Browse Source 
By: Wesley Wolfe <weswolf@aol.com>
This commit is contained in:
CraftBukkit/Spigot
2012-12-17 01:31:41 -06:00
parent 9d7ccb79f2
commit 1d39ac678a
46 changed files with 3701 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,11 +74,11 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
}
public ItemStack getItemOnCursor() {
return new CraftItemStack(getHandle().inventory.getCarried());
return CraftItemStack.asCraftMirror(getHandle().inventory.getCarried());
}
public void setItemOnCursor(ItemStack item) {
net.minecraft.server.ItemStack stack = CraftItemStack.createNMSItemStack(item);
net.minecraft.server.ItemStack stack = CraftItemStack.asNMSCopy(item);
getHandle().inventory.setCarried(stack);
if (this instanceof CraftPlayer) {
((EntityPlayer) getHandle()).broadcastCarriedItem(); // Send set slot for cursor

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
View File

@@ -22,11 +22,11 @@ public class CraftItem extends CraftEntity implements Item {
}
public ItemStack getItemStack() {
return new CraftItemStack(item.itemStack);
return CraftItemStack.asCraftMirror(item.itemStack);
}
public void setItemStack(ItemStack stack) {
item.itemStack = CraftItemStack.createNMSItemStack(stack);
item.itemStack = CraftItemStack.asNMSCopy(stack);
}
public int getPickupDelay() {

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
View File

@@ -20,12 +20,12 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
getHandle().getDataWatcher().a(2, 5);
getHandle().getDataWatcher().h(2);
} else {
getHandle().a(CraftItemStack.createNMSItemStack(item));
getHandle().a(CraftItemStack.asNMSCopy(item));
}
}
public org.bukkit.inventory.ItemStack getItem() {
return CraftItemStack.asBukkitStack(getHandle().i());
return CraftItemStack.asBukkitCopy(getHandle().i());
}
public Rotation getRotation() {