mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 19:37:35 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
From 9fba22ed9ce928dca7c5596181e6aa883e7473d8 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 1dd56aec38..1554530966 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
|
|
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;
|
|
- private static int entityCount;
|
|
+ private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1
|
|
private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
|
|
private int id;
|
|
public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
|
|
--
|
|
2.19.0
|
|
|