From 7c02d1537459145fa4459fb56330519573ebad38 Mon Sep 17 00:00:00 2001 From: Sotr Date: Sun, 2 Sep 2018 16:03:38 +0800 Subject: [PATCH] Fix a NPE and packet compat --- .../com/destroystokyo/paper/antixray/ChunkPacketInfo.java | 0 .../com/destroystokyo/paper/antixray/DataBitsReader.java | 0 .../com/destroystokyo/paper/antixray/DataBitsWriter.java | 0 .../net/minecraft/server/PacketPlayOutMapChunk.java | 0 sources/src/main/java/net/minecraft/server/Entity.java | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename {sources/src/main/java => removed}/com/destroystokyo/paper/antixray/ChunkPacketInfo.java (100%) 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}/net/minecraft/server/PacketPlayOutMapChunk.java (100%) 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);