Make ForgeEntity keep an weak reference to the entity.

This commit is contained in:
sk89q 2014-07-18 11:45:44 -07:00
parent 70f05c950a
commit 71c5b61050

View File

@ -25,33 +25,28 @@ import com.sk89q.worldedit.entity.Entity;
import com.sk89q.worldedit.entity.metadata.EntityType; import com.sk89q.worldedit.entity.metadata.EntityType;
import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.extent.Extent;
import com.sk89q.worldedit.util.Location; import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.NullWorld;
import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityList;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.lang.ref.WeakReference;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
class ForgeEntity implements Entity { class ForgeEntity implements Entity {
private final net.minecraft.entity.Entity entity; private final WeakReference<net.minecraft.entity.Entity> entityRef;
ForgeEntity(net.minecraft.entity.Entity entity) { ForgeEntity(net.minecraft.entity.Entity entity) {
checkNotNull(entity); checkNotNull(entity);
this.entity = entity; this.entityRef = new WeakReference<net.minecraft.entity.Entity>(entity);
}
/**
* Return the underlying entity.
*
* @return the underlying entity
*/
net.minecraft.entity.Entity getEntity() {
return entity;
} }
@Override @Override
public BaseEntity getState() { public BaseEntity getState() {
net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
String id = EntityList.getEntityString(entity); String id = EntityList.getEntityString(entity);
if (id != null) { if (id != null) {
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
@ -60,25 +55,41 @@ class ForgeEntity implements Entity {
} else { } else {
return null; return null;
} }
} else {
return null;
}
} }
@Override @Override
public Location getLocation() { public Location getLocation() {
net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
Vector position = new Vector(entity.posX, entity.posY, entity.posZ); Vector position = new Vector(entity.posX, entity.posY, entity.posZ);
float yaw = entity.rotationYaw; float yaw = entity.rotationYaw;
float pitch = entity.rotationPitch; float pitch = entity.rotationPitch;
return new Location(ForgeAdapter.adapt(entity.worldObj), position, yaw, pitch); return new Location(ForgeAdapter.adapt(entity.worldObj), position, yaw, pitch);
} else {
return new Location(NullWorld.getInstance());
}
} }
@Override @Override
public Extent getExtent() { public Extent getExtent() {
net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
return ForgeAdapter.adapt(entity.worldObj); return ForgeAdapter.adapt(entity.worldObj);
} else {
return NullWorld.getInstance();
}
} }
@Override @Override
public boolean remove() { public boolean remove() {
net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
entity.setDead(); entity.setDead();
}
return true; return true;
} }
@ -86,10 +97,15 @@ class ForgeEntity implements Entity {
@Nullable @Nullable
@Override @Override
public <T> T getFacet(Class<? extends T> cls) { public <T> T getFacet(Class<? extends T> cls) {
net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
if (EntityType.class.isAssignableFrom(cls)) { if (EntityType.class.isAssignableFrom(cls)) {
return (T) new ForgeEntityType(entity); return (T) new ForgeEntityType(entity);
} else { } else {
return null; return null;
} }
} else {
return null;
}
} }
} }