Portion of diff was dropped in the mappings update commit. Also remove the option to remove invalid statistics. The server will automatically do this now as of... 1.13?, our option wasn't even doing anything.
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
From 8adcfffd2be7a9ff13871063ae4849441c2c08b7 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Thu, 27 Sep 2018 00:08:31 -0400
|
|
Subject: [PATCH] Ignore Dimension NBT field in Entity data
|
|
|
|
Minecraft is trying to set Dimension Objects based on a Dimension ID
|
|
|
|
Dimension ID's for custom worlds are dynamically allocate dand not guaranteed
|
|
consistent.
|
|
|
|
This removes checking the NBT data, as the Entity will always have its
|
|
DimensionManager set to the world it is being placed into.
|
|
|
|
This fixes corrupt entities breaking chunk saving in custom worlds.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index ee878191a..0f646ac7e 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -1721,7 +1721,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
this.setAirTicks(nbttagcompound.getShort("Air"));
|
|
this.onGround = nbttagcompound.getBoolean("OnGround");
|
|
if (nbttagcompound.hasKey("Dimension")) {
|
|
- this.dimension = DimensionManager.a(nbttagcompound.getInt("Dimension"));
|
|
+ //this.dimension = DimensionManager.a(nbttagcompound.getInt("Dimension")); // Paper - always controlled by world
|
|
}
|
|
|
|
this.invulnerable = nbttagcompound.getBoolean("Invulnerable");
|
|
--
|
|
2.20.0
|
|
|