Update Luminol

This commit is contained in:
Helvetica Volubi
2026-01-21 21:37:37 +08:00
parent cf80fc6a86
commit a780b13fcc
19 changed files with 99 additions and 106 deletions
@@ -84,10 +84,10 @@ index af71e0e1eb1c93745f3e4954ecc8fbd2ad4808a3..f3829564681faff3ae8971ed90b947b4
players.add(serverPlayer1);
if (players.size() >= resultLimit) {
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
index ca199e6334f39d8598ccc22ef5aca36ecfbb4939..a32a32e19cfc07df86587cb8f7c7eabff19d97cd 100644
index 68c3b0496738ed4fcb02204c5c882fd722397648..72824013c313b7ada8dc86d9f2ff55a296fb6ac8 100644
--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
@@ -1898,7 +1898,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1901,7 +1901,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
private ServerStatus.Players buildPlayerStatus() {
@@ -96,7 +96,7 @@ index ca199e6334f39d8598ccc22ef5aca36ecfbb4939..a32a32e19cfc07df86587cb8f7c7eabf
int maxPlayers = this.getMaxPlayers();
if (this.hidesOnlinePlayers()) {
return new ServerStatus.Players(maxPlayers, players.size(), List.of());
@@ -2107,7 +2107,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2110,7 +2110,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@Override
public int getPlayerCount() {
@@ -105,7 +105,7 @@ index ca199e6334f39d8598ccc22ef5aca36ecfbb4939..a32a32e19cfc07df86587cb8f7c7eabf
}
public String[] getPlayerNames() {
@@ -2311,7 +2311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2314,7 +2314,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
} else {
int i = 0;
@@ -114,7 +114,7 @@ index ca199e6334f39d8598ccc22ef5aca36ecfbb4939..a32a32e19cfc07df86587cb8f7c7eabf
serverPlayer.getBukkitEntity().taskScheduler.schedule((ServerPlayer player) -> { // Folia - region threading
// Paper start - Expand PlayerGameModeChangeEvent
org.bukkit.event.player.PlayerGameModeChangeEvent event = player.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null); // Folia - region threading
@@ -2496,7 +2496,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2499,7 +2499,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
if (Thread.currentThread() != this.serverThread) return; // Paper
// Paper start - we don't need to save everything, just advancements
// this.getPlayerList().saveAll();
@@ -123,7 +123,7 @@ index ca199e6334f39d8598ccc22ef5aca36ecfbb4939..a32a32e19cfc07df86587cb8f7c7eabf
player.getAdvancements().save();
}
// Paper end - we don't need to save everything, just advancements
@@ -2634,7 +2634,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2637,7 +2637,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
PlayerList playerList = this.getPlayerList();
UserWhiteList whiteList = playerList.getWhiteList();
@@ -284,10 +284,10 @@ index 5a8cd3e6b448a4472092690cf589bca10b142126..158593b1a6384db635a1f224919b24c1
this.setListData(list);
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
index f41cab482168ca7b0764b371533658374dc4cc3a..15a6a96e49e55570836cca13c897c4be35662877 100644
index 1837ca833939b8c59b05c03313bec7b02bc85151..a1279303993ffed6ef5ba4ec86668ad845596318 100644
--- a/net/minecraft/server/level/ServerLevel.java
+++ b/net/minecraft/server/level/ServerLevel.java
@@ -2960,7 +2960,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -2972,7 +2972,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
if (entity instanceof ServerPlayer serverPlayer) {
ServerLevel.this.players.add(serverPlayer);
// Leaves start - skip
@@ -296,7 +296,7 @@ index f41cab482168ca7b0764b371533658374dc4cc3a..15a6a96e49e55570836cca13c897c4be
ServerLevel.this.realPlayers.add(serverPlayer);
}
// Leaves end - skip
@@ -3052,7 +3052,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -3058,7 +3058,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
if (entity instanceof ServerPlayer serverPlayer) {
ServerLevel.this.players.remove(serverPlayer);
// Leaves start - skip
@@ -306,7 +306,7 @@ index f41cab482168ca7b0764b371533658374dc4cc3a..15a6a96e49e55570836cca13c897c4be
}
// Leaves end - skip
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
index b88f669535f050605e3b5739501ef6d5caee4238..5e08d8b9c7f1869965be0ee5761bbc40f1e70300 100644
index 9eb7875fd3f2da2ded79397d275c968c0fd613ab..de8d0ad8555679e7814708046f1e93c6b9017c6d 100644
--- a/net/minecraft/server/level/ServerPlayer.java
+++ b/net/minecraft/server/level/ServerPlayer.java
@@ -202,7 +202,7 @@ import org.jspecify.annotations.Nullable;