diff options
| author | Andrew Mollenkamp <[email protected]> | 2020-01-23 09:33:28 -0600 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2020-01-23 15:33:28 +0000 |
| commit | a168ecf0fdf907fd33f7bb994f843952b62e572e (patch) | |
| tree | e4d6f06aa613347e27c9fa245b50e348c7e6da8f | |
| parent | 4866cb95ca0fa1f9acac01f38ebba11c27b91a67 (diff) | |
| download | Paper-a168ecf0fdf907fd33f7bb994f843952b62e572e.tar.gz Paper-a168ecf0fdf907fd33f7bb994f843952b62e572e.zip | |
Fix items vanishing through end portal (Resolves #2681) (#2894)
| -rw-r--r-- | Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch new file mode 100644 index 0000000000..bb8a7a7828 --- /dev/null +++ b/Spigot-Server-Patches/0429-Fix-items-vanishing-through-end-portal.patch @@ -0,0 +1,33 @@ +From e144e041f0047b0a0e867a0f793fe5ba8c8fd546 Mon Sep 17 00:00:00 2001 +From: AJMFactsheets <[email protected]> +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 e8def7f8..f65db8e2 100644 +--- a/src/main/java/net/minecraft/server/Entity.java ++++ b/src/main/java/net/minecraft/server/Entity.java +@@ -2591,6 +2591,11 @@ 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 + blockposition = worldserver1.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver1.getSpawn()); + } else if (dimensionmanager.getType() == DimensionManager.THE_END) { // CraftBukkit + blockposition = worldserver1.getDimensionSpawn(); +-- +2.17.1 + |