Update patches to latest 1.21.4 #1

Merged
Chaoscaot merged 242 commits from update/1.21.4 into main 2025-04-23 22:27:11 +02:00
11 changed files with 50 additions and 272 deletions
Showing only changes of commit 1dd52bed49 - Show all commits

View File

@ -1262,11 +1262,12 @@
}
}
@@ -1652,10 +_,11 @@
@@ -1651,11 +_,12 @@
public void kickUnlistedPlayers(CommandSourceStack commandSource) {
if (this.isEnforceWhitelist()) {
PlayerList playerList = commandSource.getServer().getPlayerList();
+ if (!playerList.isUsingWhitelist()) return; // Paper - whitelist not enabled
UserWhiteList whiteList = playerList.getWhiteList();
+ if (!((net.minecraft.server.dedicated.DedicatedServer) this).getProperties().whiteList.get()) return; // Paper - whitelist not enabled
for (ServerPlayer serverPlayer : Lists.newArrayList(playerList.getPlayers())) {
- if (!whiteList.isWhiteListed(serverPlayer.getGameProfile())) {

View File

@ -883,7 +883,7 @@ public final class CraftServer implements Server {
@Override
public boolean hasWhitelist() {
return this.getProperties().whiteList.get();
return this.playerList.isUsingWhitelist();
}
// NOTE: Temporary calls through to server.properies until its replaced