core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0315-MC-111480-Start-Entity...

25 lines
1.2 KiB
Diff
Raw Normal View History

Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches
2018-09-27 02:35:42 +00:00
From a6cc211cabcde63d81a1d739bd51a70cdb39648f Mon Sep 17 00:00:00 2001
MC-111480: Start Entity ID's at 1 - Closes #1287 DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks.
2018-07-30 03:00:00 +00: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
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches
2018-09-27 02:35:42 +00:00
index 1dd56aec38..1554530966 100644
MC-111480: Start Entity ID's at 1 - Closes #1287 DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks.
2018-07-30 03:00:00 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Paper 1.13.1 Update 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: d0bb0a1d Fix some tests randomly failing 997d378d Fix client stall in specific teleportation scenarios b3dc2366 SPIGOT-4307: Fix hacky API for banners on shields 2a271162 SPIGOT-4301: Fix more invalid enchants 5d0d83bb SPIGOT-4309: Add "forced" display of particles a6772578 Add additional tests for CraftBlockData ce1af0c3 Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
2018-08-26 18:11:49 +00:00
@@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Fix last patch for 1.13, pulled the push button too quickly...
2018-07-30 03:05:35 +00: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;
MC-111480: Start Entity ID's at 1 - Closes #1287 DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks.
2018-07-30 03:00:00 +00:00
- private static int entityCount;
+ private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1
Fix last patch for 1.13, pulled the push button too quickly...
2018-07-30 03:05:35 +00:00
private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
MC-111480: Start Entity ID's at 1 - Closes #1287 DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks.
2018-07-30 03:00:00 +00:00
private int id;
Fix last patch for 1.13, pulled the push button too quickly...
2018-07-30 03:05:35 +00:00
public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
MC-111480: Start Entity ID's at 1 - Closes #1287 DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks.
2018-07-30 03:00:00 +00:00
--
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has been tested to ensure that World Conversion still occurs correctly. Bukkit Changes: 0812ce2c SPIGOT-4397: isChunkGenerated API CraftBukkit Changes: 4824655c SPIGOT-4398: Upgrade to ASM 6.2.1 for better Java 11 support eea43870 MC-134115: Fix issues converting tile entities 1a7f2d10 SPIGOT-4397: isChunkGenerated API 40aed54d SPIGOT-4396: Improve vehicle movement Spigot Changes: f6a273b1 Rebuild patches
2018-09-27 02:35:42 +00:00
2.19.0
MC-111480: Start Entity ID's at 1 - Closes #1287 DataWatchers that store Entity ID's treat 0 as special, and can break things such as Elytra Fireworks.
2018-07-30 03:00:00 +00:00