43 Zeilen
2.9 KiB
Diff
43 Zeilen
2.9 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/advancements/critereon/LocationPredicate.java b/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
|
|
index 5f9cb2c7a2874e423087d04d3360af0364692b5c..f81aa5adf9a499cef6dc45bf3f9de2df3dc61460 100644
|
|
--- a/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
|
|
+++ b/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
|
|
@@ -25,7 +25,7 @@ public record LocationPredicate(Optional<LocationPredicate.PositionPredicate> po
|
|
public boolean matches(ServerLevel world, double x, double y, double z) {
|
|
if (this.position.isPresent() && !this.position.get().matches(x, y, z)) {
|
|
return false;
|
|
- } else if (this.dimension.isPresent() && this.dimension.get() != world.dimension()) {
|
|
+ } else if (this.dimension.isPresent() && this.dimension.get() != (io.papermc.paper.configuration.GlobalConfiguration.get().misc.strictAdvancementDimensionCheck ? world.dimension() : org.bukkit.craftbukkit.util.CraftDimensionUtil.getMainDimensionKey(world))) { // Paper
|
|
return false;
|
|
} else {
|
|
BlockPos blockPos = BlockPos.containing(x, y, z);
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
index e8d527f67e84921a94a2196e86efec96039f06e4..a5893a5e3b22934db533967f515dd5e0eb7fbf2e 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -1321,6 +1321,12 @@ public class ServerPlayer extends Player {
|
|
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) {
|
|
CriteriaTriggers.CHANGED_DIMENSION.trigger(this, resourcekey, resourcekey1);
|