mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 09:27:43 +01:00
177 lines
7.7 KiB
Diff
177 lines
7.7 KiB
Diff
From 0284d0fe32a0599358e6401836955b780eacad7c Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Thu, 26 Mar 2020 12:48:02 -0500
|
|
Subject: [PATCH] Disable mojang profiler
|
|
|
|
---
|
|
.../net/minecraft/server/CommandDebug.java | 5 ++
|
|
.../net/minecraft/server/MinecraftServer.java | 5 +-
|
|
.../net/pl3x/purpur/GameProfilerNoop.java | 68 +++++++++++++++++++
|
|
.../java/org/bukkit/craftbukkit/Main.java | 2 +
|
|
.../assets/minecraft/lang/en_us.json | 1 +
|
|
5 files changed, 80 insertions(+), 1 deletion(-)
|
|
create mode 100644 src/main/java/net/pl3x/purpur/GameProfilerNoop.java
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/CommandDebug.java b/src/main/java/net/minecraft/server/CommandDebug.java
|
|
index f0d72ea39d..415f6cb323 100644
|
|
--- a/src/main/java/net/minecraft/server/CommandDebug.java
|
|
+++ b/src/main/java/net/minecraft/server/CommandDebug.java
|
|
@@ -22,6 +22,7 @@ public class CommandDebug {
|
|
private static final Logger LOGGER = LogManager.getLogger();
|
|
private static final SimpleCommandExceptionType b = new SimpleCommandExceptionType(new ChatMessage("commands.debug.notRunning", new Object[0]));
|
|
private static final SimpleCommandExceptionType c = new SimpleCommandExceptionType(new ChatMessage("commands.debug.alreadyRunning", new Object[0]));
|
|
+ private static final SimpleCommandExceptionType disabled = new SimpleCommandExceptionType(new ChatMessage("commands.debug.disabled")); // Purpur
|
|
@Nullable
|
|
private static final FileSystemProvider d = (FileSystemProvider) FileSystemProvider.installedProviders().stream().filter((filesystemprovider) -> {
|
|
return filesystemprovider.getScheme().equalsIgnoreCase("jar");
|
|
@@ -43,6 +44,8 @@ public class CommandDebug {
|
|
MinecraftServer minecraftserver = commandlistenerwrapper.getServer();
|
|
GameProfiler gameprofiler = minecraftserver.getMethodProfiler();
|
|
|
|
+ if (gameprofiler instanceof net.pl3x.purpur.GameProfilerNoop) throw CommandDebug.disabled.create(); // Purpur
|
|
+
|
|
if (gameprofiler.d().a()) {
|
|
throw CommandDebug.c.create();
|
|
} else {
|
|
@@ -56,6 +59,8 @@ public class CommandDebug {
|
|
MinecraftServer minecraftserver = commandlistenerwrapper.getServer();
|
|
GameProfiler gameprofiler = minecraftserver.getMethodProfiler();
|
|
|
|
+ if (gameprofiler instanceof net.pl3x.purpur.GameProfilerNoop) throw CommandDebug.disabled.create(); // Purpur
|
|
+
|
|
if (!gameprofiler.d().a()) {
|
|
throw CommandDebug.b.create();
|
|
} else {
|
|
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
index c5319ff0f5..2ede67d883 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -80,7 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
private final MojangStatisticsGenerator snooper = new MojangStatisticsGenerator("server", this, SystemUtils.getMonotonicMillis());
|
|
public File universe;
|
|
private final List<Runnable> tickables = Lists.newArrayList();
|
|
- private final GameProfiler methodProfiler = new GameProfiler(this::ak);
|
|
+ protected GameProfiler methodProfiler = new net.pl3x.purpur.GameProfilerNoop(this::getTickCount); // Purpur
|
|
private ServerConnection serverConnection;
|
|
public final WorldLoadListenerFactory worldLoadListenerFactory;
|
|
private final ServerPing serverPing = new ServerPing();
|
|
@@ -1388,6 +1388,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
String s1 = (String) Optional.ofNullable(optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
|
|
final DedicatedServer dedicatedserver = new DedicatedServer(optionset, dedicatedserversettings, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache, WorldLoadListenerLogger::new, s1);
|
|
|
|
+ if (optionset.has("enableProfiler") || optionset.nonOptionArguments().contains("enableProfiler")) dedicatedserver.methodProfiler = new GameProfiler(dedicatedserver::getTickCount); // Purpur
|
|
+
|
|
/*
|
|
dedicatedserver.i((String) optionset.valueOf(optionspec7));
|
|
dedicatedserver.setPort((Integer) optionset.valueOf(optionspec10));
|
|
@@ -1813,6 +1815,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
|
|
|
|
public abstract boolean a(EnumGamemode enumgamemode, boolean flag, int i);
|
|
|
|
+ public int getTickCount() { return ak(); } // Purpur - OBFHELPER
|
|
public int ak() {
|
|
return this.ticks;
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/GameProfilerNoop.java b/src/main/java/net/pl3x/purpur/GameProfilerNoop.java
|
|
new file mode 100644
|
|
index 0000000000..b32a5418f2
|
|
--- /dev/null
|
|
+++ b/src/main/java/net/pl3x/purpur/GameProfilerNoop.java
|
|
@@ -0,0 +1,68 @@
|
|
+package net.pl3x.purpur;
|
|
+
|
|
+import net.minecraft.server.GameProfiler;
|
|
+import net.minecraft.server.MethodProfilerResults;
|
|
+import net.minecraft.server.MethodProfilerResultsEmpty;
|
|
+
|
|
+import java.util.function.IntSupplier;
|
|
+import java.util.function.Supplier;
|
|
+
|
|
+public class GameProfilerNoop extends GameProfiler {
|
|
+ private final EmptyProfiler profiler = new EmptyProfiler();
|
|
+
|
|
+ public GameProfilerNoop(IntSupplier tickCount) {
|
|
+ super(tickCount);
|
|
+ }
|
|
+
|
|
+ public GameProfiler.a d() {
|
|
+ return this.profiler;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void a() {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void b() {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void enter(String s) {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void a(Supplier<String> supplier) {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void exit() {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void exitEnter(String s) {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void c(String s) {
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void c(Supplier<String> supplier) {
|
|
+ }
|
|
+
|
|
+ static class EmptyProfiler implements GameProfiler.a {
|
|
+ @Override
|
|
+ public boolean a() { // isEnabled
|
|
+ return false;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public MethodProfilerResults b() { // disable
|
|
+ return MethodProfilerResultsEmpty.a; // empty
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void d() { // enable
|
|
+ }
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
index d1af8e9a92..9da9f54d18 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
|
@@ -151,6 +151,8 @@ public class Main {
|
|
.ofType(File.class)
|
|
.defaultsTo(new File("purpur.yml"))
|
|
.describedAs("Yml file");
|
|
+
|
|
+ acceptsAll(asList("enableProfiler"), "Enables the vanilla profiler");
|
|
// Purpur end
|
|
|
|
// Paper start
|
|
diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json
|
|
index ae0b45fe41..c4dcaaf2d4 100644
|
|
--- a/src/main/resources/assets/minecraft/lang/en_us.json
|
|
+++ b/src/main/resources/assets/minecraft/lang/en_us.json
|
|
@@ -4127,6 +4127,7 @@
|
|
"commands.clone.failed": "No blocks were cloned",
|
|
"commands.debug.notRunning": "The debug profiler hasn't started",
|
|
"commands.debug.alreadyRunning": "The debug profiler is already started",
|
|
+ "commands.debug.disabled": "The debug profiler is disabled",
|
|
"commands.deop.failed": "Nothing changed. The player is not an operator",
|
|
"commands.effect.give.failed": "Unable to apply this effect (target is either immune to effects, or has something stronger)",
|
|
"commands.effect.clear.everything.failed": "Target has no effects to remove",
|
|
--
|
|
2.24.0
|
|
|