2023-06-16 13:02:43 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: TheMeinerLP <p.glanz@madfix.me>
|
|
|
|
|
Date: Tue, 13 Jun 2023 16:10:59 +0200
|
|
|
|
|
Subject: [PATCH] Don't enforce icanhasbukkit default if alias block exists
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
Rework async chunk api implementation
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.
2024-11-19 07:34:32 +01:00
|
|
|
index 927846bf3281771de0274216abe927e524df3493..5c907eca23d936ba3095f2d81256775edaa737da 100644
|
2023-06-16 13:02:43 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2024-10-24 00:42:38 +02:00
|
|
|
@@ -358,7 +358,11 @@ public final class CraftServer implements Server {
|
2023-06-16 13:02:43 +02:00
|
|
|
}
|
|
|
|
|
this.commandsConfiguration = YamlConfiguration.loadConfiguration(this.getCommandsConfigFile());
|
|
|
|
|
this.commandsConfiguration.options().copyDefaults(true);
|
2023-10-27 01:34:58 +02:00
|
|
|
- this.commandsConfiguration.setDefaults(YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/commands.yml"), Charsets.UTF_8)));
|
2023-06-16 13:02:43 +02:00
|
|
|
+ // Paper start - don't enforce icanhasbukkit default if alias block exists
|
2023-10-27 01:34:58 +02:00
|
|
|
+ final YamlConfiguration commandsDefaults = YamlConfiguration.loadConfiguration(new InputStreamReader(this.getClass().getClassLoader().getResourceAsStream("configurations/commands.yml"), Charsets.UTF_8));
|
2023-06-16 13:02:43 +02:00
|
|
|
+ if (this.commandsConfiguration.contains("aliases")) commandsDefaults.set("aliases", null);
|
|
|
|
|
+ this.commandsConfiguration.setDefaults(commandsDefaults);
|
2024-01-21 19:37:09 +01:00
|
|
|
+ // Paper end - don't enforce icanhasbukkit default if alias block exists
|
2023-06-16 13:02:43 +02:00
|
|
|
this.saveCommandsConfig();
|
|
|
|
|
|
|
|
|
|
// Migrate aliases from old file and add previously implicit $1- to pass all arguments
|
