mirror of
https://github.com/PaperMC/Paper.git
synced 2025-01-06 18:50:51 +01:00
4d6f73449f
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:17543ecfSPIGOT-5035: Error Using Virtual Merchant GUI0fc6922bSPIGOT-5028: Villager#setVillagerExperience() doesn't workbdbdbe44SPIGOT-5024: Fox error - Unknown target reason
22 lines
No EOL
1.1 KiB
Diff
22 lines
No EOL
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
@@ -0,0 +0,0 @@ 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;
|
|
--
|