TakeV/Paper
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix last patch for 1.13, pulled the push button too quickly...

Browse source
This commit is contained in:
Aikar 2018-07-29 23:05:35 -04:00
parent bf92104a70
commit e356cd3989
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Spigot-Server-Patches/0345-MC-111480-Start-Entity-ID-s-at-1.patch → Spigot-Server-Patches/0322-MC-111480-Start-Entity-ID-s-at-1.patch
View file

@ -1,4 +1,4 @@
From b65086b45edfb15a357b918552a2d8284cce6c88 Mon Sep 17 00:00:00 2001 From 94c2a47565acf1fdadeb9b1c7554ff34734f4a44 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 29 Jul 2018 22:58:47 -0400 Date: Sun, 29 Jul 2018 22:58:47 -0400
Subject: [PATCH] MC-111480: Start Entity ID's at 1 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@ -7,18 +7,18 @@ DataWatchers that store Entity ID's treat 0 as special,
and can break things such as Elytra Fireworks. 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 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index fce677f9f6..9b5f7fcf72 100644 index 91408ce597..67df79e311 100644
--- a/src/main/java/net/minecraft/server/Entity.java --- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -81,7 +81,7 @@ public abstract class Entity implements ICommandListener, KeyedObject { // Paper @@ -90,7 +90,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
private static final List<ItemStack> b = Collections.emptyList(); private static final List<ItemStack> a = Collections.emptyList();
private static final AxisAlignedBB c = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D); private static final AxisAlignedBB b = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
private static double f = 1.0D; private static double c = 1.0D;
- private static int entityCount; - private static int entityCount;
+ private static int entityCount = 1; // Paper - MC-111480 - ID 0 is treated as special for DataWatchers, start 1 + 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; private int id;
public boolean i; public boolean blocksEntitySpawning() { return i; } // Paper - OBFHELPER public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
public final List<Entity> passengers;
-- --
2.18.0 2.18.0