mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 20:53:09 +01:00
8c5b837e05
Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads.
42 lines
3 KiB
Diff
42 lines
3 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 01b8f7024fbc965bc6a7f97f79ba3dec964ef769..801823d003a8e28a13fe90db4604cd0938899c6d 100644
|
|
--- a/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
|
|
+++ b/src/main/java/net/minecraft/advancements/critereon/LocationPredicate.java
|
|
@@ -44,7 +44,7 @@ public record LocationPredicate(
|
|
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 - Add option for strict advancement dimension checks
|
|
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 cf674caab9e67a27f90ead557634949710c19ca3..c98e07e1a507d5ffd3b16fa4bf3cdcc3b704e67d 100644
|
|
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
|
|
@@ -1655,6 +1655,12 @@ public class ServerPlayer extends net.minecraft.world.entity.player.Player {
|
|
ResourceKey<Level> maindimensionkey = CraftDimensionUtil.getMainDimensionKey(origin);
|
|
ResourceKey<Level> maindimensionkey1 = CraftDimensionUtil.getMainDimensionKey(this.level());
|
|
|
|
+ // Paper start - Add option for strict advancement dimension checks
|
|
+ if (io.papermc.paper.configuration.GlobalConfiguration.get().misc.strictAdvancementDimensionCheck) {
|
|
+ maindimensionkey = resourcekey;
|
|
+ maindimensionkey1 = resourcekey1;
|
|
+ }
|
|
+ // Paper end - Add option for strict advancement dimension checks
|
|
CriteriaTriggers.CHANGED_DIMENSION.trigger(this, maindimensionkey, maindimensionkey1);
|
|
if (maindimensionkey != resourcekey || maindimensionkey1 != resourcekey1) {
|
|
CriteriaTriggers.CHANGED_DIMENSION.trigger(this, resourcekey, resourcekey1);
|