Reduce conflict blocking for unnecessary situations

2026-08-23 00:07:52 +08:00
parent 6fdd8eee4a
commit d52bcc8c1d
60 changed files with 124 additions and 2 deletions
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: MrHua269 <mrhua269@gmail.com>
+Date: Sat, 18 Apr 2026 09:08:52 +0800
+Subject: [PATCH] Add config for server mod name
+
+
+diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
+index a7100db6d1ce6434cd9ecfdff554a4ebcfde1e66..28f5c28bdf9a3090b98451e559f807c4364ea259 100644
+--- a/net/minecraft/server/MinecraftServer.java
+++ b/net/minecraft/server/MinecraftServer.java
+@@ -2084,7 +2084,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+     }
+ 
+     public String getServerModName() {
+-        return io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper
+        return io.nanachiyo0721.shiroha.config.modules.misc.ServerModNameConfig.fakeVanilla ? "vanilla" : io.nanachiyo0721.shiroha.config.modules.misc.ServerModNameConfig.serverModName; // Paper // Shiroha - Add config for server mod name
+     }
+ 
+     public ServerClockManager clockManager() {