diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
index fd3022a0..c6e68ff9 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitChunk_1_10.java
@@ -365,8 +365,8 @@ public class BukkitChunk_1_10 extends CharFaweChunk<Chunk, BukkitQueue_1_10> {
                     net.minecraft.server.v1_10_R1.BlockPosition bp = entry.getKey();
                     net.minecraft.server.v1_10_R1.TileEntity tile = entry.getValue();
                     tiles.remove(bp);
-                    tile.y();
                     nmsWorld.s(bp);
+                    tile.y();
                     tile.invalidateBlockCache();
                 }
 
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
index f94f9a19..deec71b0 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
@@ -375,8 +375,8 @@ public class BukkitChunk_1_11 extends CharFaweChunk<Chunk, com.boydti.fawe.bukki
                     BlockPosition bp = entry.getKey();
                     TileEntity tile = entry.getValue();
                     tiles.remove(bp);
-                    tile.z();
                     nmsWorld.s(bp);
+                    tile.z();
                     tile.invalidateBlockCache();
                 }
 
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_12/BukkitChunk_1_12.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_12/BukkitChunk_1_12.java
index 2e8e2f69..c5917066 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_12/BukkitChunk_1_12.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_12/BukkitChunk_1_12.java
@@ -9,38 +9,13 @@ import com.boydti.fawe.object.FaweQueue;
 import com.boydti.fawe.util.MainUtil;
 import com.boydti.fawe.util.MathMan;
 import com.boydti.fawe.util.ReflectionUtils;
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.jnbt.ListTag;
-import com.sk89q.jnbt.LongTag;
-import com.sk89q.jnbt.StringTag;
-import com.sk89q.jnbt.Tag;
+import com.sk89q.jnbt.*;
 import com.sk89q.worldedit.internal.Constants;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import net.minecraft.server.v1_12_R1.Block;
-import net.minecraft.server.v1_12_R1.BlockPosition;
-import net.minecraft.server.v1_12_R1.ChunkSection;
-import net.minecraft.server.v1_12_R1.DataBits;
-import net.minecraft.server.v1_12_R1.DataPalette;
-import net.minecraft.server.v1_12_R1.DataPaletteBlock;
-import net.minecraft.server.v1_12_R1.DataPaletteGlobal;
-import net.minecraft.server.v1_12_R1.Entity;
-import net.minecraft.server.v1_12_R1.EntityPlayer;
-import net.minecraft.server.v1_12_R1.EntityTypes;
-import net.minecraft.server.v1_12_R1.IBlockData;
-import net.minecraft.server.v1_12_R1.MinecraftKey;
-import net.minecraft.server.v1_12_R1.NBTTagCompound;
-import net.minecraft.server.v1_12_R1.NBTTagInt;
-import net.minecraft.server.v1_12_R1.TileEntity;
+import java.util.*;
+import net.minecraft.server.v1_12_R1.*;
 import org.bukkit.Chunk;
 import org.bukkit.World;
 import org.bukkit.craftbukkit.v1_12_R1.CraftChunk;
@@ -128,6 +103,7 @@ public class BukkitChunk_1_12 extends CharFaweChunk<Chunk, BukkitQueue_1_12> {
                     if (!(currentPalette instanceof DataPaletteGlobal)) {
                         current.a(128, null);
                     }
+
                     DataPaletteBlock paletteBlock = newDataPaletteBlock();
                     currentPalette = (DataPalette) BukkitQueue_1_12.fieldPalette.get(current);
                     if (!(currentPalette instanceof DataPaletteGlobal)) {
@@ -354,39 +330,41 @@ public class BukkitChunk_1_12 extends CharFaweChunk<Chunk, BukkitQueue_1_12> {
                 }
             }
             // Trim tiles
-            Iterator<Map.Entry<BlockPosition, TileEntity>> iterator = tiles.entrySet().iterator();
             HashMap<BlockPosition, TileEntity> toRemove = null;
-            while (iterator.hasNext()) {
-                Map.Entry<BlockPosition, TileEntity> tile = iterator.next();
-                BlockPosition pos = tile.getKey();
-                int lx = pos.getX() & 15;
-                int ly = pos.getY();
-                int lz = pos.getZ() & 15;
-                int j = FaweCache.CACHE_I[ly][lz][lx];
-                char[] array = this.getIdArray(j);
-                if (array == null) {
-                    continue;
-                }
-                int k = FaweCache.CACHE_J[ly][lz][lx];
-                if (array[k] != 0) {
-                    if (toRemove == null) {
-                        toRemove = new HashMap<>();
+            if (!tiles.isEmpty()) {
+                Iterator<Map.Entry<BlockPosition, TileEntity>> iterator = tiles.entrySet().iterator();
+                while (iterator.hasNext()) {
+                    Map.Entry<BlockPosition, TileEntity> tile = iterator.next();
+                    BlockPosition pos = tile.getKey();
+                    int lx = pos.getX() & 15;
+                    int ly = pos.getY();
+                    int lz = pos.getZ() & 15;
+                    int j = FaweCache.CACHE_I[ly][lz][lx];
+                    char[] array = this.getIdArray(j);
+                    if (array == null) {
+                        continue;
                     }
-                    if (copy != null) {
-                        copy.storeTile(tile.getValue(), tile.getKey());
+                    int k = FaweCache.CACHE_J[ly][lz][lx];
+                    if (array[k] != 0) {
+                        if (toRemove == null) {
+                            toRemove = new HashMap<>();
+                        }
+                        if (copy != null) {
+                            copy.storeTile(tile.getValue(), tile.getKey());
+                        }
+                        toRemove.put(tile.getKey(), tile.getValue());
                     }
-                    toRemove.put(tile.getKey(), tile.getValue());
                 }
-            }
-            if (toRemove != null) {
-                synchronized (BukkitQueue_0.class) {
-                    for (Map.Entry<BlockPosition, TileEntity> entry : toRemove.entrySet()) {
-                        BlockPosition bp = entry.getKey();
-                        TileEntity tile = entry.getValue();
-                        tiles.remove(bp);
-                        tile.z();
-                        nmsWorld.s(bp);
-                        tile.invalidateBlockCache();
+                if (toRemove != null) {
+                    synchronized (BukkitQueue_0.class) {
+                        for (Map.Entry<BlockPosition, TileEntity> entry : toRemove.entrySet()) {
+                            BlockPosition bp = entry.getKey();
+                            TileEntity tile = entry.getValue();
+                            nmsWorld.s(bp);
+                            tiles.remove(bp);
+                            tile.z();
+                            tile.invalidateBlockCache();
+                        }
                     }
                 }
             }
@@ -485,24 +463,28 @@ public class BukkitChunk_1_12 extends CharFaweChunk<Chunk, BukkitQueue_1_12> {
             }
             // Set tiles
             Map<Short, CompoundTag> tilesToSpawn = this.getTiles();
-            for (Map.Entry<Short, CompoundTag> entry : tilesToSpawn.entrySet()) {
-                CompoundTag nativeTag = entry.getValue();
-                short blockHash = entry.getKey();
-                int x = (blockHash >> 12 & 0xF) + bx;
-                int y = (blockHash & 0xFF);
-                int z = (blockHash >> 8 & 0xF) + bz;
-                BlockPosition pos = new BlockPosition(x, y, z); // Set pos
-                synchronized (BukkitQueue_0.class) {
-                    TileEntity tileEntity = nmsWorld.getTileEntity(pos);
-                    if (tileEntity != null) {
-                        NBTTagCompound tag = (NBTTagCompound) BukkitQueue_1_12.fromNative(nativeTag);
-                        tag.set("x", new NBTTagInt(x));
-                        tag.set("y", new NBTTagInt(y));
-                        tag.set("z", new NBTTagInt(z));
-                        if (BukkitQueue_1_12.methodTileEntityLoad != null) {
-                            BukkitQueue_1_12.methodTileEntityLoad.invoke(tileEntity, tag);  // ReadTagIntoTile
-                        } else {
-                            tileEntity.load(tag);
+            if (!tilesToSpawn.isEmpty()) {
+                for (Map.Entry<Short, CompoundTag> entry : tilesToSpawn.entrySet()) {
+                    CompoundTag nativeTag = entry.getValue();
+                    short blockHash = entry.getKey();
+                    int x = (blockHash >> 12 & 0xF) + bx;
+                    int y = (blockHash & 0xFF);
+                    int z = (blockHash >> 8 & 0xF) + bz;
+                    BlockPosition pos = new BlockPosition(x, y, z); // Set pos
+                    synchronized (BukkitQueue_0.class) {
+                        TileEntity tileEntity = nmsWorld.getTileEntity(pos);
+                        if (tileEntity != null) {
+                            NBTTagCompound tag = (NBTTagCompound) BukkitQueue_1_12.fromNative(nativeTag);
+                            tag.set("x", new NBTTagInt(x));
+                            tag.set("y", new NBTTagInt(y));
+                            tag.set("z", new NBTTagInt(z));
+
+
+                            if (BukkitQueue_1_12.methodTileEntityLoad != null) {
+                                BukkitQueue_1_12.methodTileEntityLoad.invoke(tileEntity, tag);  // ReadTagIntoTile
+                            } else {
+                                tileEntity.load(tag);
+                            }
                         }
                     }
                 }
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
index 574a7848..4d5bd9f9 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitChunk_1_7.java
@@ -283,8 +283,8 @@ public class BukkitChunk_1_7 extends CharFaweChunk<Chunk, BukkitQueue17> {
                     ChunkPosition bp = entry.getKey();
                     TileEntity tile = entry.getValue();
                     tiles.remove(bp);
-                    tile.s();
                     nmsWorld.p(bp.x, bp.y, bp.z);
+                    tile.s();
                     tile.u();
                 }
 
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
index 28f17e09..aa9878f8 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitChunk_1_8.java
@@ -213,8 +213,8 @@ public class BukkitChunk_1_8 extends CharFaweChunk<Chunk, BukkitQueue18R3> {
                     BlockPosition bp = entry.getKey();
                     TileEntity tile = entry.getValue();
                     tiles.remove(bp);
-                    tile.y();
                     nmsWorld.t(bp);
+                    tile.y();
                     tile.E();
                 }
 
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
index b5bba4f4..37b4b5e5 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitChunk_1_9.java
@@ -316,8 +316,8 @@ public class BukkitChunk_1_9 extends CharFaweChunk<Chunk, BukkitQueue_1_9_R1> {
                     BlockPosition bp = entry.getKey();
                     TileEntity tile = entry.getValue();
                     tiles.remove(bp);
-                    tile.y();
                     nmsWorld.s(bp);
+                    tile.y();
                     tile.invalidateBlockCache();
                 }