geforkt von Mirrors/Paper
Dieser Commit ist enthalten in:
Ursprung
c903985792
Commit
7c36d82b47
@ -31,10 +31,10 @@ index 9ef6712c70fcd8912a79f3f61e351aac09572cf3..40c716de742c48f6d4911fae1756f9bf
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
||||
index ad2177cdbc61a6f41c7e2ed81af262d4ffe7d861..3a3b162fee5ee53e8f3fb1c9c345aaff59f576ce 100644
|
||||
index e471960e0443392f6f54732b052a4debf2a8fd97..79437b2dab2c21753281cee8c14ec2182d23e92e 100644
|
||||
--- a/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
||||
+++ b/src/main/java/io/papermc/paper/configuration/PaperConfigurations.java
|
||||
@@ -433,8 +433,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
|
||||
@@ -435,8 +435,6 @@ public class PaperConfigurations extends Configurations<GlobalConfiguration, Wor
|
||||
|
||||
// Symlinks are not correctly checked in createDirectories
|
||||
static void createDirectoriesSymlinkAware(Path path) throws IOException {
|
||||
@ -285,7 +285,7 @@ index dae36c6452ccd57a436dd918547b64d59957ab0a..1c21d56cc80c24d1c9934de9785df926
|
||||
// CraftBukkit end
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 912affb0ab1c4c40f7a655194e95ec6f0ebf1fcd..d031a6392f02b50392d7aa030b5de28b3c7897de 100644
|
||||
index 435f5ee3388f5da93df938c43ea2578f7d586407..638086445b4607dd99591ef8a861237c3b83667d 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -43,6 +43,7 @@ import java.util.Objects;
|
||||
@ -296,7 +296,7 @@ index 912affb0ab1c4c40f7a655194e95ec6f0ebf1fcd..d031a6392f02b50392d7aa030b5de28b
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.RejectedExecutionException;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
@@ -1768,9 +1769,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -1770,9 +1771,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
MinecraftServer.LOGGER.info("Generating keypair");
|
||||
|
||||
try {
|
||||
@ -354,10 +354,10 @@ index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..4331b09596cd0a83dd2f8ea325ec66a7
|
||||
if (this.convertOldUsers()) {
|
||||
this.getProfileCache().save(false); // Paper
|
||||
diff --git a/src/main/java/net/minecraft/server/players/StoredUserList.java b/src/main/java/net/minecraft/server/players/StoredUserList.java
|
||||
index 4fd709a550bf8da1e996894a1ca6b91206c31e9e..e9612c3cfe43e09a2099d8732c168d2abb2f77cb 100644
|
||||
index 9e8112fbc40a1d89c0f73ea4452e0fa1bb459bf4..140fda390af47b78eed26c76631da598b8770107 100644
|
||||
--- a/src/main/java/net/minecraft/server/players/StoredUserList.java
|
||||
+++ b/src/main/java/net/minecraft/server/players/StoredUserList.java
|
||||
@@ -9,10 +9,8 @@ import com.google.gson.JsonArray;
|
||||
@@ -10,10 +10,8 @@ import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
import com.mojang.logging.LogUtils;
|
||||
@ -370,7 +370,7 @@ index 4fd709a550bf8da1e996894a1ca6b91206c31e9e..e9612c3cfe43e09a2099d8732c168d2a
|
||||
import java.lang.reflect.ParameterizedType; // Paper
|
||||
import java.lang.reflect.Type; // Paper
|
||||
import java.nio.charset.StandardCharsets;
|
||||
@@ -159,7 +157,12 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
|
||||
@@ -154,7 +152,12 @@ public abstract class StoredUserList<K, V extends StoredUserEntry<K>> {
|
||||
|
||||
Objects.requireNonNull(jsonarray);
|
||||
stream.forEach(jsonarray::add);
|
||||
@ -815,10 +815,10 @@ index ef8b794d1a017f02f90368a48cec2ea7bb57f218..9a73d051902164fe8d8adb5792f2d786
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..82884932c6171601420025dd7549aa7be2969ec5 100644
|
||||
index 249d76acac9a91cd46f0b8a477511974a75d6f4a..00bd7100fe2dd5787c57c5fea68e13a08d03c22d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -488,7 +488,7 @@ public final class CraftServer implements Server {
|
||||
@@ -492,7 +492,7 @@ public final class CraftServer implements Server {
|
||||
try {
|
||||
this.configuration.save(this.getConfigFile());
|
||||
} catch (IOException ex) {
|
||||
@ -827,7 +827,7 @@ index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..82884932c6171601420025dd7549aa7b
|
||||
}
|
||||
}
|
||||
|
||||
@@ -496,7 +496,7 @@ public final class CraftServer implements Server {
|
||||
@@ -500,7 +500,7 @@ public final class CraftServer implements Server {
|
||||
try {
|
||||
this.commandsConfiguration.save(this.getCommandsConfigFile());
|
||||
} catch (IOException ex) {
|
||||
@ -836,7 +836,7 @@ index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..82884932c6171601420025dd7549aa7b
|
||||
}
|
||||
}
|
||||
|
||||
@@ -558,7 +558,7 @@ public final class CraftServer implements Server {
|
||||
@@ -562,7 +562,7 @@ public final class CraftServer implements Server {
|
||||
DefaultPermissions.registerCorePermissions();
|
||||
CraftDefaultPermissions.registerCorePermissions();
|
||||
if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) this.loadCustomPermissions(); // Paper
|
||||
@ -846,7 +846,7 @@ index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..82884932c6171601420025dd7549aa7b
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
index d4f6935a1bea77e5118bfd538f9b1358c21591a7..7a8ea98c98ae2694fa1013b923f34bd7013940c4 100644
|
||||
index 776b7fc26fe96b69be260bbd36efae147d988640..016a9b4b06a5a5a19a458db7a26d45420165502d 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -300,7 +300,7 @@ public class Main {
|
||||
|
@ -96,10 +96,10 @@ index 02ee521dc0f61f3f01d443c46c1066d1ecbeea7f..e0304ba9538350d0cec4687c814f2ffd
|
||||
}
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index dc8f95ab94c907e7b006ca440fa4797463e6f601..73c534541e605795391d3c0557bf2e5963de8ad7 100644
|
||||
index 6be184c7eecd3383de72911460c80d4fe6e95326..651be84bb551f1ca7a48bee3d0d9dfcc777b0179 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -2089,7 +2089,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -2091,7 +2091,6 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
this.getPlayerList().reloadResources();
|
||||
this.functionManager.replaceLibrary(this.resources.managers.getFunctionLibrary());
|
||||
this.structureTemplateManager.onResourceManagerReload(this.resources.resourceManager);
|
||||
|
36
patches/server/1009-Fix-player-chunk-loader-initialization.patch
Normale Datei
36
patches/server/1009-Fix-player-chunk-loader-initialization.patch
Normale Datei
@ -0,0 +1,36 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Lixfel <agga-games@gmx.de>
|
||||
Date: Fri, 25 Aug 2023 19:16:30 +0200
|
||||
Subject: [PATCH] Fix player chunk loader initialization
|
||||
|
||||
|
||||
diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
|
||||
index 924539d4ac50c70178ba220424ffacd6ff277c8b..7af3a6c512186ffee49d6677f91d9b337c5634c0 100644
|
||||
--- a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
|
||||
+++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
|
||||
@@ -246,6 +246,16 @@ public class RegionizedPlayerChunkLoader {
|
||||
}
|
||||
|
||||
private static long[] generateBFSOrder(final int radius) {
|
||||
+ final int side = radius*2 + 1;
|
||||
+ long[] array = new long[side*side];
|
||||
+ int i = 0;
|
||||
+ for(int z = -radius; z <= radius; z++) {
|
||||
+ for(int x = -radius; x <= radius; x++) {
|
||||
+ array[i++] = CoordinateUtils.getChunkKey(x, z);
|
||||
+ }
|
||||
+ }
|
||||
+ return array;
|
||||
+ /*
|
||||
final LongArrayList chunks = new LongArrayList();
|
||||
final LongArrayFIFOQueue queue = new LongArrayFIFOQueue();
|
||||
final LongOpenHashSet seen = new LongOpenHashSet();
|
||||
@@ -371,7 +381,7 @@ public class RegionizedPlayerChunkLoader {
|
||||
ret.addAll(dist);
|
||||
}
|
||||
|
||||
- return ret.toLongArray();
|
||||
+ return ret.toLongArray();*/
|
||||
}
|
||||
|
||||
public static final class PlayerChunkLoaderData {
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren