PaperMC/Spigot-Server-Patches/0273-MC-111480-Start-Entity-ID-s-at-1.patch

From f3e67244df3ab9e3a6e9bb0828d6b666f4c712e1 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 50b6765a55..8a95e0f117 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
     // CraftBukkit end
 
     protected static final Logger LOGGER = LogManager.getLogger();
-    private static final AtomicInteger entityCount = new AtomicInteger();
+    private static final AtomicInteger entityCount = new AtomicInteger(1); // paper - start entity count from 1
     private static final List<ItemStack> c = Collections.emptyList();
     private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
     private static double e = 1.0D;
-- 
2.21.0
Update upstream & fix some chunk related issues (#2177) * Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 45690fe9 SPIGOT-5047: Correct slot types for 1.14 inventories CraftBukkit Changes: 4090d01f SPIGOT-5047: Correct slot types for 1.14 inventories e8c08362 SPIGOT-5046: World#getLoadedChunks returning inaccessible cached chunks. d445af3b SPIGOT-5067: Add item meta for 1.14 spawn eggs * Bring Chunk load checks in-line with spigot As of the last upstream merge spigot now checks ticket level status when returning loaded chunks for a world from api. Now our checks will respect that decision. * Fix spawn ticket levels Vanilla would keep the inner chunks of spawn available for ticking, however my changes made all chunks non-ticking. Resolve by changing ticket levels for spawn chunks inside the border to respect this behavior. * Make World#getChunkIfLoadedImmediately return only entity ticking chunks Mojang appears to be using chunks with level > 33 (non-ticking chunks) as cached chunks and not actually loaded chunks. * Bring all loaded checks in line with spigot Loaded chunks must be at least border chunks, or level <= 33 2019-06-14 04:27:40 +02:00			`From f3e67244df3ab9e3a6e9bb0828d6b666f4c712e1 Mon Sep 17 00:00:00 2001`
Even more patches for 1.14 2019-05-05 04:23:25 +02:00			`From: Aikar <aikar@aikar.co>`
			`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`
Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 17543ecf SPIGOT-5035: Error Using Virtual Merchant GUI 0fc6922b SPIGOT-5028: Villager#setVillagerExperience() doesn't work bdbdbe44 SPIGOT-5024: Fox error - Unknown target reason 2019-06-06 17:36:57 +02:00			`index 50b6765a55..8a95e0f117 100644`
Even more patches for 1.14 2019-05-05 04:23:25 +02:00			`--- a/src/main/java/net/minecraft/server/Entity.java`
			`+++ b/src/main/java/net/minecraft/server/Entity.java`
Update Upstream 2019-05-06 04:58:04 +02:00			`@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke`
Even more patches for 1.14 2019-05-05 04:23:25 +02:00			`// CraftBukkit end`

			`protected static final Logger LOGGER = LogManager.getLogger();`
			`- private static final AtomicInteger entityCount = new AtomicInteger();`
			`+ private static final AtomicInteger entityCount = new AtomicInteger(1); // paper - start entity count from 1`
			`private static final List<ItemStack> c = Collections.emptyList();`
			`private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);`
			`private static double e = 1.0D;`
			`--`
			`2.21.0`