Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-16 04:50:05 +01:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1dFix some tests randomly failing997d378dFix client stall in specific teleportation scenariosb3dc2366SPIGOT-4307: Fix hacky API for banners on shields2a271162SPIGOT-4301: Fix more invalid enchants5d0d83bbSPIGOT-4309: Add "forced" display of particlesa6772578Add additional tests for CraftBlockDatace1af0c3Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
25 Zeilen
1.2 KiB
Diff
25 Zeilen
1.2 KiB
Diff
From 0ee43fd09448733a29c41dcb66161b63b0c4f5b3 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 f5e66aaf90..7b07fe1990 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.18.0
|
|
|