From 87070e5caea5f2585b7d6c69382818890070667c Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Wed, 24 Oct 2018 14:41:04 -0400
Subject: [PATCH] Always write dimension NBT, even if we ignore it

DataPacks can use the dimension field for various things, so we should
still write this field to NBT, even if we ignore reading it ourselves.
---
 .../Ignore-Dimension-NBT-field-in-Entity-data.patch      | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Spigot-Server-Patches/Ignore-Dimension-NBT-field-in-Entity-data.patch b/Spigot-Server-Patches/Ignore-Dimension-NBT-field-in-Entity-data.patch
index 20324e9c79..872e133c29 100644
--- a/Spigot-Server-Patches/Ignore-Dimension-NBT-field-in-Entity-data.patch
+++ b/Spigot-Server-Patches/Ignore-Dimension-NBT-field-in-Entity-data.patch
@@ -17,15 +17,6 @@ diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/
 index 7ac07ac07ac0..7ac07ac07ac0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-             nbttagcompound.setShort("Fire", (short) this.fireTicks);
-             nbttagcompound.setShort("Air", (short) this.getAirTicks());
-             nbttagcompound.setBoolean("OnGround", this.onGround);
--            nbttagcompound.setInt("Dimension", this.dimension.getDimensionID());
-+            //nbttagcompound.setInt("Dimension", this.dimension.getDimensionID()); // Paper - always controlled by world
-             nbttagcompound.setBoolean("Invulnerable", this.invulnerable);
-             nbttagcompound.setInt("PortalCooldown", this.portalCooldown);
-             nbttagcompound.a("UUID", this.getUniqueID());
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.setAirTicks(nbttagcompound.getShort("Air"));
              this.onGround = nbttagcompound.getBoolean("OnGround");