aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0619-Prevent-softlocked-end-exit-portal-generation.patch
diff options
context:
space:
mode:
authorSpottedleaf <[email protected]>2024-07-17 10:24:53 -0700
committerSpottedleaf <[email protected]>2024-07-17 10:28:32 -0700
commit00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6 (patch)
tree82639515bc5e9ae00c1e639e72137ed51e1ac688 /patches/server/0619-Prevent-softlocked-end-exit-portal-generation.patch
parent967f98aa81da851740aeb429778e46159fd188df (diff)
downloadPaper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.tar.gz
Paper-00b949f1bbbf444e2b5e7b8de7c9b14fbd2133c6.zip
Remove Moonrise utils to MCUtils, remove duplicated/unused utils
Diffstat (limited to 'patches/server/0619-Prevent-softlocked-end-exit-portal-generation.patch')
-rw-r--r--patches/server/0619-Prevent-softlocked-end-exit-portal-generation.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/server/0619-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0619-Prevent-softlocked-end-exit-portal-generation.patch
new file mode 100644
index 0000000000..e2698e961b
--- /dev/null
+++ b/patches/server/0619-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 609b20e2b222c5b1fddf22c2621d0d7a88cabcfa..b8bba857aa390e5435b8a199a25065a940d6a972 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
+@@ -466,6 +466,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 - Prevent "softlocked" exit portal generation
+ if (worldgenendtrophy.place(FeatureConfiguration.NONE, this.level, this.level.getChunkSource().getGenerator(), RandomSource.create(), this.portalLocation)) {
+ int i = Mth.positiveCeilDiv(4, 16);
+