mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-01 07:57:29 +02:00
c97ce029e9
PaperMC believes that 1.16.2 is now ready for general release as we fixed the main issue plagueing the 1.16.x release, the MapLike data conversion issues. Until now, it was not safe for a server to convert a world to 1.16.2 without data conversion issues around villages and potentially other things. If you did, those MapLike errors meant something went wrong. This is now resolved. Big thanks to all those that helped, notably @BillyGalbreath and @Proximyst who did large parts of the update process with me. Please as always, backup your worlds and test before updating to 1.16.2! If you update to 1.16.2, there is no going back to an older build than this. --------------------------------- Co-authored-by: William Blake Galbreath <Blake.Galbreath@GMail.com> Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com> Co-authored-by: krolik-exe <69214078+krolik-exe@users.noreply.github.com> Co-authored-by: BillyGalbreath <BillyGalbreath@users.noreply.github.com> Co-authored-by: stonar96 <minecraft.stonar96@gmail.com> Co-authored-by: Shane Freeder <theboyetronic@gmail.com> Co-authored-by: Jason <jasonpenilla2@me.com> Co-authored-by: kashike <kashike@vq.lc> Co-authored-by: Aurora <21148213+aurorasmiles@users.noreply.github.com> Co-authored-by: KennyTV <kennytv@t-online.de> Co-authored-by: commandblockguy <commandblockguy1@gmail.com> Co-authored-by: DigitalRegent <misterwener@gmail.com> Co-authored-by: ishland <ishlandmc@yeah.net>
80 lines
3.7 KiB
Diff
80 lines
3.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sun, 29 Mar 2020 18:26:14 -0400
|
|
Subject: [PATCH] Ensure Entity is never double registered
|
|
|
|
If something calls register twice, and the world is ticking, it could be
|
|
enqueued to add twice.
|
|
|
|
Vs behavior of non ticking of just overwriting state.
|
|
|
|
We will now simply log a warning when this happens instead of crashing the server.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index 6b525e813034cb43403f9b116b5d661eb3be49aa..78d2b48385bcb2090058d617599ef2b639fecbcf 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -61,6 +61,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
}
|
|
|
|
// Paper start
|
|
+ boolean isQueuedForRegister = false;
|
|
public static Random SHARED_RANDOM = new Random() {
|
|
private boolean locked = false;
|
|
@Override
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 4e9bfa66f2ed110c71c865c05d4573d2df84489c..62b2a4d38102b1ffbda4d2fc031350a51fcf180c 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -531,6 +531,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
Entity entity2;
|
|
|
|
while ((entity2 = (Entity) this.entitiesToAdd.poll()) != null) {
|
|
+ if (!entity2.isQueuedForRegister) continue; // Paper - ignore cancelled registers
|
|
this.registerEntity(entity2);
|
|
}
|
|
|
|
@@ -1265,6 +1266,19 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
|
|
public void unregisterEntity(Entity entity) {
|
|
org.spigotmc.AsyncCatcher.catchOp("entity unregister"); // Spigot
|
|
+ // Paper start - fix entity registration issues
|
|
+ if (entity instanceof EntityComplexPart) {
|
|
+ // Usually this is a no-op for complex parts, and ID's should be removed, but go ahead and remove it anyways
|
|
+ // Dragon parts are handled special in register. they don't receive a valid = true or register by UUID etc.
|
|
+ this.entitiesById.remove(entity.getId(), entity);
|
|
+ return;
|
|
+ }
|
|
+ if (!entity.valid) {
|
|
+ // Someone called remove before we ever got added, cancel the add.
|
|
+ entity.isQueuedForRegister = false;
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
// Spigot start
|
|
if ( entity instanceof EntityHuman )
|
|
{
|
|
@@ -1331,9 +1345,21 @@ public class WorldServer extends World implements GeneratorAccessSeed {
|
|
|
|
private void registerEntity(Entity entity) {
|
|
org.spigotmc.AsyncCatcher.catchOp("entity register"); // Spigot
|
|
+ // Paper start - don't double enqueue entity registration
|
|
+ //noinspection ObjectEquality
|
|
+ if (this.entitiesById.get(entity.getId()) == entity) {
|
|
+ LOGGER.error(entity + " was already registered!");
|
|
+ new Throwable().printStackTrace();
|
|
+ return;
|
|
+ }
|
|
+ // Paper end
|
|
if (this.tickingEntities) {
|
|
- this.entitiesToAdd.add(entity);
|
|
+ if (!entity.isQueuedForRegister) { // Paper
|
|
+ this.entitiesToAdd.add(entity);
|
|
+ entity.isQueuedForRegister = true; // Paper
|
|
+ }
|
|
} else {
|
|
+ entity.isQueuedForRegister = false; // Paper
|
|
this.entitiesById.put(entity.getId(), entity);
|
|
if (entity instanceof EntityEnderDragon) {
|
|
EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).eJ();
|