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

[Bleeding] Allow CraftItem to be backed by non-EntityItems. Fixes BUKKIT-1351

Browse Source 
By: feildmaster <admin@feildmaster.com>
This commit is contained in:
CraftBukkit/Spigot
2012-03-25 20:58:12 -05:00
parent ae4b2591f7
commit 0ebe730fce
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
package org.bukkit.craftbukkit.entity; package org.bukkit.craftbukkit.entity;
import net.minecraft.server.Entity;
import net.minecraft.server.EntityItem; import net.minecraft.server.EntityItem;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@@ -11,9 +12,13 @@ import org.bukkit.craftbukkit.CraftServer;
public class CraftItem extends CraftEntity implements Item { public class CraftItem extends CraftEntity implements Item {
private EntityItem item; private EntityItem item;
public CraftItem(CraftServer server, EntityItem entity) { public CraftItem(CraftServer server, Entity entity, EntityItem item) {
super(server, entity); super(server, entity);
this.item = entity; this.item = item;
}
public CraftItem(CraftServer server, EntityItem entity) {
this(server, entity, entity);
} }
public ItemStack getItemStack() { public ItemStack getItemStack() {
@@ -32,11 +37,6 @@ public class CraftItem extends CraftEntity implements Item {
item.pickupDelay = delay; item.pickupDelay = delay;
} }
@Override
public EntityItem getHandle() {
return (EntityItem) entity;
}
@Override @Override
public String toString() { public String toString() {
return "CraftItem"; return "CraftItem";