From 9e128b8d0c41fb89552102418e469559712f7d42 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Fri, 20 May 2016 04:43:28 +1000
Subject: [PATCH] Fix entity create/remove

---
 .../com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java   | 3 ---
 .../main/java/com/boydti/fawe/object/HistoryExtent.java   | 8 +++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
index 8cff18b4..467d9526 100644
--- a/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
+++ b/bukkit19/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
@@ -421,7 +421,6 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Dat
                         }
                         int j = FaweCache.CACHE_J[y][x][z];
                         if (array[j] != 0) {
-//                            System.out.println("REMOVE ENT (blocked): " + 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]);
                     for (Entity entity : ents) {
                         if (entsToRemove.contains(entity.getUniqueID())) {
-//                            System.out.println("REMOVE ENT (action): " + 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);
                     nmsWorld.addEntity(entity, CreatureSpawnEvent.SpawnReason.CUSTOM);
                     createdEntities.add(entity.getUniqueID());
-//                    System.out.println("CREATE ENT (action): " + entity);
                 }
             }
             // Change task?
diff --git a/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java b/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
index c7f12d85..67aefd6e 100644
--- a/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
+++ b/core/src/main/java/com/boydti/fawe/object/HistoryExtent.java
@@ -12,8 +12,6 @@ import com.sk89q.worldedit.entity.BaseEntity;
 import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.extent.AbstractDelegateExtent;
 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.regions.Region;
 import com.sk89q.worldedit.util.Location;
@@ -87,8 +85,8 @@ public class HistoryExtent extends AbstractDelegateExtent {
     @Override
     public Entity createEntity(final Location location, final BaseEntity state) {
         final Entity entity = super.createEntity(location, state);
-        if ((state != null) && (entity != null)) {
-            this.changeSet.add(new EntityCreate(location, state, entity));
+        if ((state != null)) {
+            this.changeSet.addEntityCreate(state.getNbtData());
         }
         return entity;
     }
@@ -139,7 +137,7 @@ public class HistoryExtent extends AbstractDelegateExtent {
             final BaseEntity state = this.entity.getState();
             final boolean success = this.entity.remove();
             if ((state != null) && success) {
-                HistoryExtent.this.changeSet.add(new EntityRemove(location, state));
+                HistoryExtent.this.changeSet.addEntityRemove(state.getNbtData());
             }
             return success;
         }