diff --git a/sources/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java b/removed/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
similarity index 100%
rename from sources/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
rename to removed/com/destroystokyo/paper/antixray/ChunkPacketInfo.java
diff --git a/sources/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java b/removed/com/destroystokyo/paper/antixray/DataBitsReader.java
similarity index 100%
rename from sources/src/main/java/com/destroystokyo/paper/antixray/DataBitsReader.java
rename to removed/com/destroystokyo/paper/antixray/DataBitsReader.java
diff --git a/sources/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java b/removed/com/destroystokyo/paper/antixray/DataBitsWriter.java
similarity index 100%
rename from sources/src/main/java/com/destroystokyo/paper/antixray/DataBitsWriter.java
rename to removed/com/destroystokyo/paper/antixray/DataBitsWriter.java
diff --git a/sources/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/removed/net/minecraft/server/PacketPlayOutMapChunk.java
similarity index 100%
rename from sources/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
rename to removed/net/minecraft/server/PacketPlayOutMapChunk.java
diff --git a/sources/src/main/java/net/minecraft/server/Entity.java b/sources/src/main/java/net/minecraft/server/Entity.java
index 3177aab41..6791850c6 100644
--- a/sources/src/main/java/net/minecraft/server/Entity.java
+++ b/sources/src/main/java/net/minecraft/server/Entity.java
@@ -211,7 +211,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
         this.length = 1.8F;
         this.aA = 1.0F;
         this.aB = 1.0F;
-        this.random = ((IMixinWorldServer) world).rand(); // Paper // Akarin
+        this.random = world == null ? SHARED_RANDOM : ((IMixinWorldServer) world).rand(); // Paper // Akarin
         this.fireTicks = -this.getMaxFireTicks();
         this.justCreated = true;
         this.uniqueID = MathHelper.a(this.random);