2018-08-27 02:11:49 +08:00
|
|
|
From 0ee43fd09448733a29c41dcb66161b63b0c4f5b3 Mon Sep 17 00:00:00 2001
|
2018-07-30 11:00:00 +08: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
|
2018-08-27 02:11:49 +08:00
|
|
|
index f5e66aaf90..7b07fe1990 100644
|
2018-07-30 11:00:00 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2018-08-27 02:11:49 +08:00
|
|
|
@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2018-07-30 11:05:35 +08:00
|
|
|
private static final List<ItemStack> a = Collections.emptyList();
|
|
|
|
private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
|
|
|
|
private static double c = 1.0D;
|
2018-07-30 11:00:00 +08:00
|
|
|
- private static int entityCount;
|
|
|
|
+ private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1
|
2018-07-30 11:05:35 +08:00
|
|
|
private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
|
2018-07-30 11:00:00 +08:00
|
|
|
private int id;
|
2018-07-30 11:05:35 +08:00
|
|
|
public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
|
2018-07-30 11:00:00 +08:00
|
|
|
--
|
2018-08-06 06:55:03 +08:00
|
|
|
2.18.0
|
2018-07-30 11:00:00 +08:00
|
|
|
|