From 29032edb5b3c095ffd857d0744b92bc8d92dc698 Mon Sep 17 00:00:00 2001
From: Mariell Hoversholm <proximyst@proximyst.com>
Date: Fri, 24 Jul 2020 01:09:57 +0200
Subject: [PATCH] Fix PersistentDataContainer contract violation (_->!null
 returns null)

---
 ...-get-a-BlockState-without-a-snapshot.patch | 38 +++++++++++++++++--
 .../0395-Optimize-Hoppers.patch               |  6 +--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch b/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
index 4bcc3e1f5..743163e5d 100644
--- a/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0180-API-to-get-a-BlockState-without-a-snapshot.patch
@@ -13,10 +13,27 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6c4c804797fbbe73d179c6ed089427e64d0ebff4..6ccca984daa803ddf446a8f69aca0d86ee27fabc 100644
+index 6c4c804797fbbe73d179c6ed089427e64d0ebff4..338cf8c896a6fc869eb9c54d39ad5713f6fcc377 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -33,6 +33,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+     public TileEntity(TileEntityTypes<?> tileentitytypes) {
+         this.position = BlockPosition.ZERO;
+         this.tileType = tileentitytypes;
++        persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY); // Paper - always init
+     }
+ 
+     // Paper start
+@@ -81,7 +82,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+     public void load(IBlockData iblockdata, NBTTagCompound nbttagcompound) {
+         this.position = new BlockPosition(nbttagcompound.getInt("x"), nbttagcompound.getInt("y"), nbttagcompound.getInt("z"));
+         // CraftBukkit start - read container
+-        this.persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
++        this.persistentDataContainer.clear(); // Paper - clear instead of reinit
+ 
+         NBTTagCompound persistentDataTag = nbttagcompound.getCompound("PublicBukkitValues");
+         if (persistentDataTag != null) {
+@@ -231,7 +232,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
      }
  
      // CraftBukkit start - add method
@@ -29,7 +46,7 @@ index 6c4c804797fbbe73d179c6ed089427e64d0ebff4..6ccca984daa803ddf446a8f69aca0d86
          if (world == null) return null;
          // Spigot start
          org.bukkit.block.Block block = world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ());
-@@ -240,7 +245,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -240,7 +246,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
              return null;
          }
          // Spigot end
@@ -130,3 +147,18 @@ index 15022ada0c2fd0f4302b45c55f46d0fdd3bfd57f..af15656cc4b4c1e9da4fc8a5bfffa95e
      }
  
      @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
+index 58e2db5da178af6a8c30f563353fefe720ff9781..b704f550de290e0bc1235bf7e68c7eb347162c69 100644
+--- a/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
++++ b/src/main/java/org/bukkit/craftbukkit/persistence/CraftPersistentDataContainer.java
+@@ -155,4 +155,10 @@ public final class CraftPersistentDataContainer implements PersistentDataContain
+     public Map<String, Object> serialize() {
+         return (Map<String, Object>) CraftNBTTagConfigSerializer.serialize(toTagCompound());
+     }
++
++    // Paper start
++    public void clear() {
++        this.customDataTags.clear();
++    }
++    // Paper end
+ }
diff --git a/Spigot-Server-Patches/0395-Optimize-Hoppers.patch b/Spigot-Server-Patches/0395-Optimize-Hoppers.patch
index 643fabeaf..81223b2e8 100644
--- a/Spigot-Server-Patches/0395-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0395-Optimize-Hoppers.patch
@@ -85,10 +85,10 @@ index bdcbc2a05714c37fc034ddbfd0166efbeff1c4ac..9290d6c84e764bf691d9222723d73209
              this.methodProfiler.a(() -> {
                  return worldserver + " " + worldserver.getDimensionKey().a();
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 6ccca984daa803ddf446a8f69aca0d86ee27fabc..e48fbf6280e107ab3a288f9099373df0fd6fccbd 100644
+index 6edd5b7ab68572746056e35e5f3a0825eb5224c5..a1bb45a5754b5455082a6ccc6d6b6cf3b62aa63d 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -63,6 +63,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
      public void setCurrentChunk(Chunk chunk) {
          this.currentChunk = chunk != null ? new java.lang.ref.WeakReference<>(chunk) : null;
      }
@@ -96,7 +96,7 @@ index 6ccca984daa803ddf446a8f69aca0d86ee27fabc..e48fbf6280e107ab3a288f9099373df0
      // Paper end
  
      @Nullable
-@@ -140,6 +141,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
+@@ -141,6 +142,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
  
      public void update() {
          if (this.world != null) {