From b15c43a38971a92fff66282e937923cfad488a71 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 23 Oct 2018 19:03:32 -0400 Subject: Update upstream for minecart spawner improvement --- .../0344-MC-111480-Start-Entity-ID-s-at-1.patch | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Spigot-Server-Patches/0344-MC-111480-Start-Entity-ID-s-at-1.patch (limited to 'Spigot-Server-Patches/0344-MC-111480-Start-Entity-ID-s-at-1.patch') diff --git a/Spigot-Server-Patches/0344-MC-111480-Start-Entity-ID-s-at-1.patch b/Spigot-Server-Patches/0344-MC-111480-Start-Entity-ID-s-at-1.patch new file mode 100644 index 0000000000..0704357df5 --- /dev/null +++ b/Spigot-Server-Patches/0344-MC-111480-Start-Entity-ID-s-at-1.patch @@ -0,0 +1,24 @@ +From 996d5012be524c6833e6834a0fe7e530993ef648 Mon Sep 17 00:00:00 2001 +From: Aikar +Date: Sun, 29 Jul 2018 22:58:47 -0400 +Subject: [PATCH] MC-111480: Start Entity ID's at 1 + +DataWatchers that store Entity ID's treat 0 as special, +and can break things such as Elytra Fireworks. + +diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java +index d2dbaaf2..3a2ff25e 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -81,7 +81,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper + private static final List b = Collections.emptyList(); + private static final AxisAlignedBB c = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); + private static double f = 1.0D; +- private static int entityCount; ++ private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1 + private int id; + public boolean i; public boolean blocksEntitySpawning() { return i; } // Paper - OBFHELPER + public final List passengers; +-- +2.19.1 + -- cgit v1.2.3