mirror of
https://github.com/boy0001/FastAsyncWorldedit.git
synced 2024-10-05 02:17:55 +02:00
Fix entity create/remove
This commit is contained in:
parent
54864b73d2
commit
9e128b8d0c
@ -421,7 +421,6 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Dat
|
|||||||
}
|
}
|
||||||
int j = FaweCache.CACHE_J[y][x][z];
|
int j = FaweCache.CACHE_J[y][x][z];
|
||||||
if (array[j] != 0) {
|
if (array[j] != 0) {
|
||||||
// System.out.println("REMOVE ENT (blocked): " + entity);
|
|
||||||
nmsWorld.removeEntity(entity);
|
nmsWorld.removeEntity(entity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -433,7 +432,6 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Dat
|
|||||||
Collection<Entity> ents = new ArrayList<>(entities[i]);
|
Collection<Entity> ents = new ArrayList<>(entities[i]);
|
||||||
for (Entity entity : ents) {
|
for (Entity entity : ents) {
|
||||||
if (entsToRemove.contains(entity.getUniqueID())) {
|
if (entsToRemove.contains(entity.getUniqueID())) {
|
||||||
// System.out.println("REMOVE ENT (action): " + entity);
|
|
||||||
nmsWorld.removeEntity(entity);
|
nmsWorld.removeEntity(entity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -472,7 +470,6 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Dat
|
|||||||
entity.setLocation(x, y, z, yaw, pitch);
|
entity.setLocation(x, y, z, yaw, pitch);
|
||||||
nmsWorld.addEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM);
|
nmsWorld.addEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM);
|
||||||
createdEntities.add(entity.getUniqueID());
|
createdEntities.add(entity.getUniqueID());
|
||||||
// System.out.println("CREATE ENT (action): " + entity);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Change task?
|
// Change task?
|
||||||
|
@ -12,8 +12,6 @@ import com.sk89q.worldedit.entity.BaseEntity;
|
|||||||
import com.sk89q.worldedit.entity.Entity;
|
import com.sk89q.worldedit.entity.Entity;
|
||||||
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
|
import com.sk89q.worldedit.extent.AbstractDelegateExtent;
|
||||||
import com.sk89q.worldedit.extent.Extent;
|
import com.sk89q.worldedit.extent.Extent;
|
||||||
import com.sk89q.worldedit.history.change.EntityCreate;
|
|
||||||
import com.sk89q.worldedit.history.change.EntityRemove;
|
|
||||||
import com.sk89q.worldedit.history.changeset.ChangeSet;
|
import com.sk89q.worldedit.history.changeset.ChangeSet;
|
||||||
import com.sk89q.worldedit.regions.Region;
|
import com.sk89q.worldedit.regions.Region;
|
||||||
import com.sk89q.worldedit.util.Location;
|
import com.sk89q.worldedit.util.Location;
|
||||||
@ -87,8 +85,8 @@ public class HistoryExtent extends AbstractDelegateExtent {
|
|||||||
@Override
|
@Override
|
||||||
public Entity createEntity(final Location location, final BaseEntity state) {
|
public Entity createEntity(final Location location, final BaseEntity state) {
|
||||||
final Entity entity = super.createEntity(location, state);
|
final Entity entity = super.createEntity(location, state);
|
||||||
if ((state != null) && (entity != null)) {
|
if ((state != null)) {
|
||||||
this.changeSet.add(new EntityCreate(location, state, entity));
|
this.changeSet.addEntityCreate(state.getNbtData());
|
||||||
}
|
}
|
||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
@ -139,7 +137,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
|
|||||||
final BaseEntity state = this.entity.getState();
|
final BaseEntity state = this.entity.getState();
|
||||||
final boolean success = this.entity.remove();
|
final boolean success = this.entity.remove();
|
||||||
if ((state != null) && success) {
|
if ((state != null) && success) {
|
||||||
HistoryExtent.this.changeSet.add(new EntityRemove(location, state));
|
HistoryExtent.this.changeSet.addEntityRemove(state.getNbtData());
|
||||||
}
|
}
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user