1 files changed, 29 insertions, 0 deletions
diff --git a/patches/server/0904-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0904-Add-option-for-strict-advancement-dimension-checks.patch
new file mode 100644
index 0000000000..3aaa6591bd
--- /dev/null
+++ b/patches/server/0904-Add-option-for-strict-advancement-dimension-checks.patch
@@ -0,0 +1,29 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Sun, 12 Jun 2022 11:47:24 -0700
+Subject: [PATCH] Add option for strict advancement dimension checks
+
+Craftbukkit attempts to translate worlds that use the
+same generation as the Overworld, The Nether, or The End
+to use those dimensions when checking the `changed_dimension`
+criteria trigger, or whether to trigger the `NETHER_TRAVEL`
+distance trigger. This adds a config option to ignore that
+and use the exact dimension key of the worlds involved.
+
+diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+index 3f3ebe28c669419091fd20c18185c61712e7f1e8..3615576c24d5d6790a6894a91180de25fa0e5a9c 100644
+--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
++++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
+@@ -1251,6 +1251,12 @@ public class ServerPlayer extends Player {
+         // CraftBukkit start
+         ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
+         ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level);
++        // Paper start - config for strict advancement checks for dimensions
++        if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.strictAdvancementDimensionCheck) {
++            maindimensionkey = resourcekey;
++            maindimensionkey1 = resourcekey1;
++        }
++        // Paper end
+ 
+         CriteriaTriggers.CHANGED_DIMENSION.trigger(this, maindimensionkey, maindimensionkey1);
+         if (maindimensionkey != resourcekey || maindimensionkey1 != resourcekey1) {