Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-19 10:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ForgeEntity keep an weak reference to the entity.

Browse Source
This commit is contained in:
sk89q 2014-07-18 11:45:44 -07:00
parent 70f05c950a
commit 71c5b61050
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/forge/java/com/sk89q/worldedit/forge/ForgeEntity.java
View File

@ -25,38 +25,36 @@ 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() {
String id = EntityList.getEntityString(entity); net.minecraft.entity.Entity entity = entityRef.get();
if (id != null) { if (entity != null) {
NBTTagCompound tag = new NBTTagCompound(); String id = EntityList.getEntityString(entity);
entity.writeToNBT(tag); if (id != null) {
return new BaseEntity(id, NBTConverter.fromNative(tag)); NBTTagCompound tag = new NBTTagCompound();
entity.writeToNBT(tag);
return new BaseEntity(id, NBTConverter.fromNative(tag));
} else {
return null;
}
} else { } else {
return null; return null;
} }
@ -64,21 +62,34 @@ class ForgeEntity implements Entity {
@Override @Override
public Location getLocation() { public Location getLocation() {
Vector position = new Vector(entity.posX, entity.posY, entity.posZ); net.minecraft.entity.Entity entity = entityRef.get();
float yaw = entity.rotationYaw; if (entity != null) {
float pitch = entity.rotationPitch; Vector position = new Vector(entity.posX, entity.posY, entity.posZ);
float yaw = entity.rotationYaw;
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() {
return ForgeAdapter.adapt(entity.worldObj); net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
return ForgeAdapter.adapt(entity.worldObj);
} else {
return NullWorld.getInstance();
}
} }
@Override @Override
public boolean remove() { public boolean remove() {
entity.setDead(); net.minecraft.entity.Entity entity = entityRef.get();
if (entity != null) {
entity.setDead();
}
return true; return true;
} }
@ -86,8 +97,13 @@ class ForgeEntity implements Entity {
@Nullable @Nullable
@Override @Override
public <T> T getFacet(Class<? extends T> cls) { public <T> T getFacet(Class<? extends T> cls) {
if (EntityType.class.isAssignableFrom(cls)) { net.minecraft.entity.Entity entity = entityRef.get();
return (T) new ForgeEntityType(entity); if (entity != null) {
if (EntityType.class.isAssignableFrom(cls)) {
return (T) new ForgeEntityType(entity);
} else {
return null;
}
} else { } else {
return null; return null;
} }