From 5fe93610c99f93d06fd810162dcdce5d2077e4b6 Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Sun, 2 Sep 2018 15:56:10 +0800
Subject: [PATCH] Fix a NPE and packet compat

---
 .../com/destroystokyo/paper/antixray/DataBitsReader.java       | 0
 .../com/destroystokyo/paper/antixray/DataBitsWriter.java       | 0
 .../paper/antixray/PacketPlayOutMapChunkInfo.java              | 0
 .../net/minecraft/server/PacketPlayOutMapChunk.java            | 0
 sources/src/main/java/net/minecraft/server/Entity.java         | 3 ++-
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename {sources/src/main/java => removed}/com/destroystokyo/paper/antixray/DataBitsReader.java (100%)
 rename {sources/src/main/java => removed}/com/destroystokyo/paper/antixray/DataBitsWriter.java (100%)
 rename {sources/src/main/java => removed}/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java (100%)
 rename {sources/src/main/java => removed}/net/minecraft/server/PacketPlayOutMapChunk.java (100%)

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/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java b/removed/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
similarity index 100%
rename from sources/src/main/java/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.java
rename to removed/com/destroystokyo/paper/antixray/PacketPlayOutMapChunkInfo.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 628c23e4b..4adb62ed3 100644
--- a/sources/src/main/java/net/minecraft/server/Entity.java
+++ b/sources/src/main/java/net/minecraft/server/Entity.java
@@ -27,6 +27,7 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Vehicle;
 import co.aikar.timings.MinecraftTimings; // Paper
 import co.aikar.timings.Timing; // Paper
+import io.akarin.api.internal.Akari;
 import io.akarin.api.internal.mixin.IMixinWorldServer;
 
 import org.bukkit.event.entity.EntityCombustByEntityEvent;
@@ -210,7 +211,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper
         this.length = 1.8F;
         this.ax = 1;
         this.ay = 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);