diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/ChunkProviderServer.java b/WindSpigot-Server/src/main/java/net/minecraft/server/ChunkProviderServer.java
index 08bdf2fc..e86cc0e0 100644
--- a/WindSpigot-Server/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/WindSpigot-Server/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -21,14 +21,15 @@
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongArraySet;
 import it.unimi.dsi.fastutil.longs.LongIterator;
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import it.unimi.dsi.fastutil.longs.LongSet;
 
 // TacoSpigot end
 public class ChunkProviderServer implements IChunkProvider {
 
 	private static final Logger b = LogManager.getLogger();
-	public LongSet unloadQueue = new LongArraySet(); // CraftBukkit - LongHashSet // TacoSpigot - LongHashSet ->
-														// HashArraySet
+	public LongSet unloadQueue = new LongOpenHashSet(); // CraftBukkit - LongHashSet // TacoSpigot - LongHashSet ->
+														// HashArraySet // Nacho - LongHashSet -> LongOpenHashSet
 	public Chunk emptyChunk;
 	public IChunkProvider chunkProvider;
 	// FlamePaper - Make chunkLoader public
diff --git a/WindSpigot-Server/src/main/java/net/minecraft/server/World.java b/WindSpigot-Server/src/main/java/net/minecraft/server/World.java
index 03d21808..c88a57ac 100644
--- a/WindSpigot-Server/src/main/java/net/minecraft/server/World.java
+++ b/WindSpigot-Server/src/main/java/net/minecraft/server/World.java
@@ -890,6 +890,8 @@ public int c(BlockPosition blockposition, boolean flag) {
 					blockposition = new BlockPosition(blockposition.getX(), 255, blockposition.getZ());
 				}
 
+                if (!this.isLoaded(blockposition)) return 0; // Paper
+
 				Chunk chunk = this.getChunkAtWorldCoords(blockposition);
 
 				return chunk.a(blockposition, this.I);