30 lines
1.7 KiB
Diff
30 lines
1.7 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||
|
|
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 c8057f98e16ba6e19640e0b250e5201e0f4f57db..353463084d90eb684717e65c56da52cd25a1e375 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
||
|
|
@@ -1252,6 +1252,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) {
|