From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: M2ke4U <79621885+MrHua269@users.noreply.github.com> Date: Sun, 26 Nov 2023 11:17:37 +0800 Subject: [PATCH] Add config for server brand name diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java index 5d7110a33957a597592cacb864c947eb053e8563..25cda48a6ab9a703d64c391007f5c32c368fdbe2 100644 --- a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java @@ -1,6 +1,7 @@ package com.destroystokyo.paper.network; import com.destroystokyo.paper.event.server.PaperServerListPingEvent; +import me.earthme.luminol.LuminolConfig; import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerPlayer; import org.bukkit.entity.Player; @@ -14,7 +15,7 @@ class PaperServerListPingEventImpl extends PaperServerListPingEvent { PaperServerListPingEventImpl(MinecraftServer server, StatusClient client, int protocolVersion, @Nullable CachedServerIcon icon) { super(client, server.server.motd(), server.getPlayerCount(), server.getMaxPlayers(), - server.getServerModName() + ' ' + server.getServerVersion(), protocolVersion, icon); + LuminolConfig.fakeVanillaModeEnabled ? server.getServerVersion() : server.getServerModName() + ' ' + server.getServerVersion(), protocolVersion, icon);//Luminol - Fake vanilla mode this.server = server; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 781612b6fc3d020e832164ebce231961dd68e24e..03165a7791aeac54e44391bbb0f432b613369bfa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -53,6 +53,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import javax.annotation.Nullable; import javax.imageio.ImageIO; + +import me.earthme.luminol.LuminolConfig; import net.minecraft.CrashReport; import net.minecraft.ReportedException; import net.minecraft.SharedConstants; @@ -1833,7 +1835,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! + return LuminolConfig.fakeVanillaModeEnabled ? "vanilla" : LuminolConfig.serverModName; //Luminol //Luminol - Luminol > // Folia - Folia > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public SystemReport fillSystemReport(SystemReport details) {