Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
0708fa363b
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:eb2e6578SPIGOT-5116: Fix concurrent modification exception inside ChunkMapDistance989f9b3dSPIGOT-4849: Fix server crash when accessing chunks during chunk load/unload/populate eventsf554183cSPIGOT-5171: Don't fire PlayerTeleportEvent if not actually moving2349feb8SPIGOT-5163: Cancelling PlayerBucketFillEvent visually removes the targeted block Spigot Changes: 9a643a6a Remove DataWatcher Locking
25 Zeilen
1.1 KiB
Diff
25 Zeilen
1.1 KiB
Diff
From c2525f012bd43e0ee24318fae3ce49ccb3377074 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 8328b8e08..2cbc4af68 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.22.0
|
|
|