diff --git a/patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch b/patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch index 2f8f847..760457f 100644 --- a/patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch +++ b/patches/server/0020-Avoid-double-I-O-operation-on-load-player-file.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Avoid double I/O operation on load player file diff --git a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java -index 36af81f0957d17e170d229059c66f4eb4539dfeb..b4b74bff0579b919266e91464b36c9381342b677 100644 +index 36af81f0957d17e170d229059c66f4eb4539dfeb..bf9a4571b05c9e2bacb6b26c7b24d33c6b4830f1 100644 --- a/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java +++ b/src/main/java/net/minecraft/world/level/storage/PlayerDataStorage.java @@ -56,7 +56,8 @@ public class PlayerDataStorage { @@ -14,7 +14,7 @@ index 36af81f0957d17e170d229059c66f4eb4539dfeb..b4b74bff0579b919266e91464b36c938 boolean usingWrongFile = false; - if ( org.bukkit.Bukkit.getOnlineMode() && !file.exists() ) // Paper - Check online mode first + boolean isNormalFile = file.exists() && file.isFile(); // Plazma - Avoid double I/O operation -+ if ( org.bukkit.Bukkit.getOnlineMode() && isNormalFile ) // Paper - Check online mode first // Plazma - Avoid double I/O operation ++ if ( org.bukkit.Bukkit.getOnlineMode() && !isNormalFile ) // Paper - Check online mode first // Plazma - Avoid double I/O operation { file = new File( this.playerDir, java.util.UUID.nameUUIDFromBytes( ( "OfflinePlayer:" + player.getScoreboardName() ).getBytes( "UTF-8" ) ).toString() + ".dat"); if ( file.exists() ) diff --git a/patches/server/0024-Implement-No-Chat-Reports.patch b/patches/server/0024-Implement-No-Chat-Reports.patch index 23b8044..7d1bebf 100644 --- a/patches/server/0024-Implement-No-Chat-Reports.patch +++ b/patches/server/0024-Implement-No-Chat-Reports.patch @@ -82,17 +82,17 @@ index 9d6db4a378036559efab91c8b7dcf2a6b0c2cce6..4d9f73add791cef03cc7aeaf1598a73c } } diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 770b959d9e51ef0645415d5a0d7d79b7031abd66..82670c8bc74cbb208a91cec433498b823e86ce2e 100644 +index 770b959d9e51ef0645415d5a0d7d79b7031abd66..f902505c850b9ea68733bd40e62b02b40a235e42 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -682,6 +682,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -681,6 +681,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface + @Override public boolean enforceSecureProfile() { - DedicatedServerProperties dedicatedserverproperties = this.getProperties(); + if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().noChatReports.enabled) return false; // Plazma - Implement No Chat Reports + DedicatedServerProperties dedicatedserverproperties = this.getProperties(); // Paper start - fix secure profile with proxy online mode return dedicatedserverproperties.enforceSecureProfile - && io.papermc.paper.configuration.GlobalConfiguration.get().proxies.isProxyOnlineMode() diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java index b19c59a87d4136da583a0b687f6b27fef3456f09..b54372c32845d2bc340951c0ea88d480efc1dd6a 100644 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java