2018-08-06 01:46:43 +02:00
|
|
|
From 24e2d607bc3e0037cf02ff59d705e4143e11b327 Mon Sep 17 00:00:00 2001
|
2018-07-30 05:00:00 +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
|
2018-08-06 01:46:43 +02:00
|
|
|
index 68b4a902eb..ce33cd5b83 100644
|
2018-07-30 05:00:00 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2018-07-31 03:19:41 +02:00
|
|
|
@@ -91,7 +91,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2018-07-30 05:05:35 +02: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 05:00:00 +02: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 05:05:35 +02:00
|
|
|
private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
|
2018-07-30 05:00:00 +02:00
|
|
|
private int id;
|
2018-07-30 05:05:35 +02:00
|
|
|
public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
|
2018-07-30 05:00:00 +02:00
|
|
|
--
|
2018-08-06 00:55:03 +02:00
|
|
|
2.18.0
|
2018-07-30 05:00:00 +02:00
|
|
|
|