From 602f614630e4d40a967451ac87626c03101c6897 Mon Sep 17 00:00:00 2001
From: Andrew Mollenkamp <34605013+AJMFactsheets@users.noreply.github.com>
Date: Thu, 23 Jan 2020 09:33:28 -0600
Subject: [PATCH] Fix items vanishing through end portal (Resolves #2681)
 (#2894)

hehe
---
 Spigot-Server-Patches/5000.patch              | 31 +++++++++++++++++++
 .../Tracking-Range-Improvements.patch         |  2 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 Spigot-Server-Patches/5000.patch

diff --git a/Spigot-Server-Patches/5000.patch b/Spigot-Server-Patches/5000.patch
new file mode 100644
index 0000000000..389e0959c6
--- /dev/null
+++ b/Spigot-Server-Patches/5000.patch
@@ -0,0 +1,31 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: AJMFactsheets <AJMFactsheets@gmail.com>
+Date: Wed, 22 Jan 2020 19:52:28 -0600
+Subject: [PATCH] Fix items vanishing through end portal
+
+If the Paper configuration option "keep-spawn-loaded" is set to false,
+items entering the overworld from the end will spawn at Y = 0.
+
+This is due to logic in the getHighestBlockYAt method in World.java
+only searching the heightmap if the chunk is loaded.
+
+Quickly loading the exact world spawn chunk before searching the
+heightmap resolves the issue without having to load all spawn chunks.
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index c1ffd6dc1c..f8461960e0 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
+ 
+         if (blockposition == null) { // CraftBukkit
+             if (dimensionmanager1.getType() == DimensionManager.THE_END && dimensionmanager == DimensionManager.OVERWORLD) { // CraftBukkit
++                // Paper start - Ensure spawn chunk is always loaded before calculating Y coordinate
++                if (!worldserver1.isLoaded(worldserver1.getSpawn())) {
++                    worldserver1.getChunkAtWorldCoords(worldserver1.getSpawn());
++                }
++                // Paper end
+                 // CraftBukkit start
+                 EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver1, worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()), 0);
+                 if (event == null) {
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Tracking-Range-Improvements.patch b/Spigot-Server-Patches/Tracking-Range-Improvements.patch
index 0fb816231a..cce295203c 100644
--- a/Spigot-Server-Patches/Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/Tracking-Range-Improvements.patch
@@ -8,7 +8,7 @@ Sets tracking range of watermobs to animals instead of misc and simplifies code
 Also ignores Enderdragon, defaulting it to Mojang's setting
 
 diff --git a/src/main/java/org/spigotmc/TrackingRange.java b/src/main/java/org/spigotmc/TrackingRange.java
-index 6f8e6c1d0..46c33e691 100644
+index 6f8e6c1d07..46c33e6917 100644
 --- a/src/main/java/org/spigotmc/TrackingRange.java
 +++ b/src/main/java/org/spigotmc/TrackingRange.java
 @@ -0,0 +0,0 @@