2020-05-06 11:48:49 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2020-01-23 16:33:28 +01:00
|
|
|
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
|
2020-06-26 01:38:24 +02:00
|
|
|
index bc162a4f18d1123a2e844f4429ea2c26b632dfe5..6cfbece5cbb6effb843f54e9917a755e2a9df4c5 100644
|
2020-01-23 16:33:28 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2020-06-26 01:38:24 +02:00
|
|
|
@@ -2532,6 +2532,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2020-01-23 16:33:28 +01:00
|
|
|
|
|
|
|
if (blockposition == null) { // CraftBukkit
|
2020-06-26 01:38:24 +02:00
|
|
|
if (this.world.getDimensionKey() == World.THE_END && worldserver.getDimensionKey() == World.OVERWORLD) {
|
2020-01-23 16:33:28 +01:00
|
|
|
+ // Paper start - Ensure spawn chunk is always loaded before calculating Y coordinate
|
2020-06-26 01:38:24 +02:00
|
|
|
+ this.world.getChunkAtWorldCoords(this.world.getSpawn());
|
2020-01-23 16:33:28 +01:00
|
|
|
+ // Paper end
|
|
|
|
// CraftBukkit start
|
2020-06-26 01:38:24 +02:00
|
|
|
EntityPortalEvent event = CraftEventFactory.callEntityPortalEvent(this, worldserver, worldserver.getHighestBlockYAt(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver.getSpawn()), 0);
|
2020-01-23 16:33:28 +01:00
|
|
|
if (event == null) {
|