papermc/Spigot-Server-Patches/0265-MC-111480-Start-Entity-ID-s-at-1.patch

24 lines
1.1 KiB
Diff

From 21b99a17c395ec6d2fbeb541b9bdcbb5cf4f28a1 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 4a931aaf42..75343a4386 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -93,7 +93,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.24.1