some patch cleanups

PlazmaMC · May 15, 2024 · 9dbff36 · 9dbff36
1 parent 64df11d
commit 9dbff36
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/patches/server/0013-Optimize-default-configurations.patch b/patches/server/0013-Optimize-default-configurations.patch
@@ -477,34 +477,6 @@ index 6717941d18dbd6871b4613106b9787063e11722f..b6a6a74dfd00a4536258c8693048c9d1
      public boolean zombieBypassMobGriefing = false;
      public boolean zombieTakeDamageFromWater = false;
      public boolean zombieAlwaysDropExp = false;
-diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 6c2a3813e7d63d57f07a8fa2edbb9d231221d818..cda84c869881a4d63bcf81b1e8b0145d198db490 100644
---- a/src/main/java/org/spigotmc/SpigotConfig.java
-+++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -197,8 +197,8 @@ public class SpigotConfig
-     public static String whitelistMessage;
-     public static String unknownCommandMessage;
-     public static String serverFullMessage;
--    public static String outdatedClientMessage = "Outdated client! Please use {0}";
--    public static String outdatedServerMessage = "Outdated server! I\'m still on {0}";
-+    public static String outdatedClientMessage = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "<lang:multiplayer.disconnect.outdated_client>" : "Outdated client! Please use {0}"; // Plazma - Optimize default configurations
-+    public static String outdatedServerMessage = org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "<lang:multiplayer.disconnect.outdated_server>" : "Outdated server! I\'m still on {0}"; // Plazma - Optimize default configurations
-     private static String transform(String s)
-     {
-         return ChatColor.translateAlternateColorCodes( '&', s ).replaceAll( "\\\\n", "\n" );
-@@ -211,9 +211,9 @@ public class SpigotConfig
-             SpigotConfig.set( "messages.outdated-server", SpigotConfig.outdatedServerMessage );
-         }
-
--        SpigotConfig.whitelistMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.whitelist", "You are not whitelisted on this server!" ) );
--        SpigotConfig.unknownCommandMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.unknown-command", "Unknown command. Type \"/help\" for help." ) );
--        SpigotConfig.serverFullMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.server-full", "The server is full!" ) );
-+        SpigotConfig.whitelistMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.whitelist", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "<lang:multiplayer.disconnect.not_whitelisted>" : "You are not whitelisted on this server!" ) ); // Plazma - Optimize default configurations
-+        SpigotConfig.unknownCommandMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.unknown-command", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "" : "Unknown command. Type \"/help\" for help." ) ); // Plazma - Optimize default configurations
-+        SpigotConfig.serverFullMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.server-full", org.plazmamc.plazma.configurations.PlazmaConfigurations.optimize() ? "<lang:multiplayer.disconnect.server_full>" : "The server is full!" ) ); // Plazma - Optimize default configurations
-         SpigotConfig.outdatedClientMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.outdated-client", SpigotConfig.outdatedClientMessage ) );
-         SpigotConfig.outdatedServerMessage = SpigotConfig.transform( SpigotConfig.getString( "messages.outdated-server", SpigotConfig.outdatedServerMessage ) );
-     }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 index 1cf6d4f854d89c515e48e1fb365eb95ff9340765..7d1ae99e83dc6511838092c3ab6e0fd5f39faabc 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java

diff --git a/patches/server/0036-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch b/patches/server/0036-Use-Plazma-logo-instead-if-server-favicon-doesn-t-ex.patch
@@ -69,13 +69,13 @@ index 87cb1529a6bba0f0778cf97c3c5473c3a8503b59..f388a07678ef253b19da814f6d90c4d7
 
      public Optional<Path> getWorldScreenshotFile() {
 diff --git a/src/main/java/org/plazmamc/plazma/Options.java b/src/main/java/org/plazmamc/plazma/Options.java
-index d6ead6b1bc73df85a8e8938acd2e8465dd82df97..c5c16ce481445cd9bf4184e47fe0c37ddc97a009 100644
+index d6ead6b1bc73df85a8e8938acd2e8465dd82df97..0e7fe1a8f1ad75ff92f97c9eab029fd4f4c20abc 100644
 --- a/src/main/java/org/plazmamc/plazma/Options.java
 +++ b/src/main/java/org/plazmamc/plazma/Options.java
 @@ -7,5 +7,6 @@ public interface Options {
      boolean NO_OPTIMIZE = getBoolean("Plazma.disableConfigOptimization");
      boolean NO_WARN = getBoolean("Plazma.iKnowWhatIAmDoing");
      boolean AGGRESSIVE = Boolean.getBoolean("Plazma.aggressiveOptimize") && !NO_OPTIMIZE;
-+    boolean VANILLA_ICO = Boolean.getBoolean("Plazma.useVanillaServerFavicon");
++    boolean VANILLA_ICO = Boolean.getBoolean("Plazma.useVanillaFavicon");
 
  }