diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch index 6d95ddc2b..8478debd9 100644 --- a/patches/server/0003-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -421,7 +421,7 @@ index ca8ae8e1c51b937dac916e0b0dc94b5e2e61efeb..324495c8be1a54434e7c73158d7d20db // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code) } diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..c08b91752f66a99bc6cd4495a33a400fba2b5429 100644 +index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..317ac7c5f1c2d542be260f7e86f9a7281506ebe0 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -2,28 +2,40 @@ package org.bukkit.craftbukkit.util; @@ -461,7 +461,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..c08b91752f66a99bc6cd4495a33a400f + version = properties.getProperty("version"); } catch (IOException ex) { - Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get Bukkit version!", ex); -+ Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get Plazma version!", ex); ++ Logger.getLogger(Versioning.class.getName()).log(Level.SEVERE, "Could not get " + BRANDING + " version!", ex); } } + } @@ -486,7 +486,7 @@ index de70bfdbdd7740fdf20dd063a7a623a9e96cef98..85f4a9300aebfd4ee64d179dfa1f7ffd serverModName = getString("settings.server-mod-name", serverModName); } diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java -index a353eb9f45af7b7f9bfd92a4a89403335b841840..e9203846793c3e16099556b10e5cf99376474f13 100644 +index a353eb9f45af7b7f9bfd92a4a89403335b841840..e4513839e002d776420a1c4a82dd5c5b2ca13efb 100644 --- a/src/main/java/org/spigotmc/WatchdogThread.java +++ b/src/main/java/org/spigotmc/WatchdogThread.java @@ -96,7 +96,7 @@ public final class WatchdogThread extends io.papermc.paper.util.TickThread // Pa @@ -512,7 +512,7 @@ index a353eb9f45af7b7f9bfd92a4a89403335b841840..e9203846793c3e16099556b10e5cf993 + log.log( Level.SEVERE, "If you are unsure or still think this is a " + org.bukkit.craftbukkit.util.Versioning.BRANDING + " bug, please report this to " + org.bukkit.craftbukkit.util.Versioning.REPOSITORY ); // Purpur // Plazma - Rebrand log.log( Level.SEVERE, "Be sure to include ALL relevant console errors and Minecraft crash reports" ); - log.log( Level.SEVERE, "Purpur version: " + Bukkit.getServer().getVersion() ); // Purpur -+ log.log( Level.SEVERE, "Plazma version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Rebrand ++ log.log( Level.SEVERE, org.bukkit.craftbukkit.util.Versioning.BRANDING " version: " + Bukkit.getServer().getVersion() ); // Purpur // Plazma - Rebrand // if ( net.minecraft.world.level.Level.lastPhysicsProblem != null ) {