diff options
| author | Shane Freeder <[email protected]> | 2022-03-02 09:44:22 +0000 |
|---|---|---|
| committer | Shane Freeder <[email protected]> | 2022-03-02 09:44:22 +0000 |
| commit | c6ea84c7fae8d2974820333505a39c7b01c39b90 (patch) | |
| tree | 0a863ecd50aa71b1196200c545651fe7eb779e2a /patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch | |
| parent | d3caeeb6c27cc832030a90c714a69ad2457b6e95 (diff) | |
| download | Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.tar.gz Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.zip | |
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may
actually be a regression, not too sure here, but, as-is this patch
is dead
Diffstat (limited to 'patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch')
| -rw-r--r-- | patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch new file mode 100644 index 0000000000..855c2ec833 --- /dev/null +++ b/patches/server/0786-Prevent-softlocked-end-exit-portal-generation.patch @@ -0,0 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Noah van der Aa <[email protected]> +Date: Mon, 30 Aug 2021 15:22:18 +0200 +Subject: [PATCH] Prevent softlocked end exit portal generation + + +diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java +index 7dbe0bc8082c8e7741f40bbd69bc7d7407945754..ed6ff35a2112cea4faa6e1458d1effc40fce5dd2 100644 +--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java ++++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java +@@ -412,6 +412,11 @@ public class EndDragonFight { + } + } + ++ // Paper start - Prevent "softlocked" exit portal generation ++ if (this.portalLocation.getY() <= this.level.getMinBuildHeight()) { ++ this.portalLocation = this.portalLocation.atY(this.level.getMinBuildHeight() + 1); ++ } ++ // Paper end + endPodiumFeature.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), new Random(), this.portalLocation); + } + |