Remove our /mspt command in favor of Paper's

This commit is contained in:
William Blake Galbreath
2020-04-12 13:34:40 -05:00
parent b2a0de5386
commit 35b84461ed
28 changed files with 41 additions and 146 deletions

View File

@@ -1,104 +0,0 @@
From 3d3d61859962afb1eca34aa2c9ecb70bb94c18ef Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 13 Mar 2020 22:23:44 -0500
Subject: [PATCH] Add /mspt command
---
.../minecraft/server/CommandDispatcher.java | 1 +
.../net/pl3x/purpur/command/MSPTCommand.java | 59 +++++++++++++++++++
src/main/resources/purpur.lang | 2 +
3 files changed, 62 insertions(+)
create mode 100644 src/main/java/net/pl3x/purpur/command/MSPTCommand.java
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 37b1a7947c..c9d1f94100 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -106,6 +106,7 @@ public class CommandDispatcher {
CommandIdleTimeout.a(this.b);
CommandStop.a(this.b);
CommandWhitelist.a(this.b);
+ net.pl3x.purpur.command.MSPTCommand.register(getDispatcher()); // Purpur
}
this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> {
diff --git a/src/main/java/net/pl3x/purpur/command/MSPTCommand.java b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java
new file mode 100644
index 0000000000..c3ffe528d4
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/command/MSPTCommand.java
@@ -0,0 +1,59 @@
+package net.pl3x.purpur.command;
+
+import net.minecraft.server.CommandDispatcher;
+import net.minecraft.server.CommandListenerWrapper;
+import net.minecraft.server.LocaleLanguage;
+import net.minecraft.server.MinecraftServer;
+import org.bukkit.ChatColor;
+
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class MSPTCommand {
+ private static final DecimalFormat DF = new DecimalFormat("########0.0");
+
+ public static void register(com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher) {
+ dispatcher.register(CommandDispatcher.register("mspt")
+ .requires((listener) -> {
+ return listener.hasPermission(2);
+ })
+ .executes((context) -> {
+ return execute(context.getSource());
+ })
+ ).setPermission("bukkit.command.mspt");
+ }
+
+ private static int execute(CommandListenerWrapper sender) {
+ MinecraftServer server = MinecraftServer.getServer();
+
+ List<String> times = new ArrayList<>();
+ times.addAll(eval(server.tickTimes5s.getTimes()));
+ times.addAll(eval(server.tickTimes10s.getTimes()));
+ times.addAll(eval(server.tickTimes60s.getTimes()));
+
+ sender.sendMessage(LocaleLanguage.translate("commands.purpur.mspt"), false);
+ sender.sendMessage(LocaleLanguage.translate("commands.purpur.mspt.times", times.toArray()), false);
+ return 0;
+ }
+
+ private static List<String> eval(long[] times) {
+ long min = Integer.MAX_VALUE;
+ long max = 0L;
+ long total = 0L;
+ for (long value : times) {
+ if (value > 0L && value < min) min = value;
+ if (value > max) max = value;
+ total += value;
+ }
+ double avgD = ((double) total / (double) times.length) * 1.0E-6D;
+ double minD = ((double) min) * 1.0E-6D;
+ double maxD = ((double) max) * 1.0E-6D;
+ return Arrays.asList(getColor(avgD), getColor(minD), getColor(maxD));
+ }
+
+ private static String getColor(double avg) {
+ return ChatColor.COLOR_CHAR + (avg >= 50 ? "c" : avg >= 40 ? "e" : "a") + DF.format(avg);
+ }
+}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index e925e1374d..8d670b3650 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1,5 +1,7 @@
{
"cannot.ride.mob": "You cannot mount that mob",
+ "commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
+ "commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
"idle.timeout.broadcast.away": "§e§o%s is now AFK",
"idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
}
--
2.24.0

View File

@@ -1,4 +1,4 @@
From 19fb72c1a63969314198cf85c3666e2bdd53f1cc Mon Sep 17 00:00:00 2001
From 18371ccd6c987c89fde646a16a38009e77a2a5ed Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 13 Mar 2020 22:29:10 -0500
Subject: [PATCH] Add /ping command
@@ -30,7 +30,7 @@ index 39a6a9ac00..5568649b7e 100644
List<EntityPlayer> list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource());
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index c9d1f94100..3b15f953bc 100644
index 37b1a7947c..b38a5223cb 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -30,7 +30,7 @@ import org.bukkit.event.server.ServerCommandEvent;
@@ -42,15 +42,15 @@ index c9d1f94100..3b15f953bc 100644
// CraftBukkit start
public final CommandDispatcher init(boolean flag) {
@@ -107,6 +107,7 @@ public class CommandDispatcher {
@@ -106,6 +106,7 @@ public class CommandDispatcher {
CommandIdleTimeout.a(this.b);
CommandStop.a(this.b);
CommandWhitelist.a(this.b);
net.pl3x.purpur.command.MSPTCommand.register(getDispatcher()); // Purpur
+ net.pl3x.purpur.command.PingCommand.register(getDispatcher()); // Purpur
}
this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> {
@@ -316,10 +317,12 @@ public class CommandDispatcher {
@@ -315,10 +316,12 @@ public class CommandDispatcher {
}
@@ -115,13 +115,12 @@ index 0000000000..dac3083bf0
+ }
+}
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index 8d670b3650..4326c04b27 100644
index e925e1374d..e81beea7fa 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -2,6 +2,7 @@
@@ -1,5 +1,6 @@
{
"cannot.ride.mob": "You cannot mount that mob",
"commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
"commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
+ "commands.purpur.ping": "§a%s's ping is %sms",
"idle.timeout.broadcast.away": "§e§o%s is now AFK",
"idle.timeout.broadcast.back": "§e§o%s is no longer AFK"

View File

@@ -1,4 +1,4 @@
From c8408324eef2f8527f35472e6a59899aaa6bf588 Mon Sep 17 00:00:00 2001
From c9045a7548ec20979abe24abd5ba01f0a09eaa29 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 19 Mar 2020 19:39:34 -0500
Subject: [PATCH] Add option to allow loyalty on tridents to work in the void

View File

@@ -1,4 +1,4 @@
From c49d530abdca0726bd1fe168a4e55d0154c60b21 Mon Sep 17 00:00:00 2001
From b0bc21755a5e38baabe4784ff0c3ea29e981c651 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 11:47:39 -0500
Subject: [PATCH] Configurable server mod name

View File

@@ -1,4 +1,4 @@
From cfeb1df877afa9cbe04a4e068de6d79da3e33f7c Mon Sep 17 00:00:00 2001
From 13c5b21b96154ccac5be6eb4a1d7ab2b2b09ebcd Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 21 Mar 2020 18:33:05 -0500
Subject: [PATCH] End gateway should check if entity can use portal

View File

@@ -1,4 +1,4 @@
From 1b727afb3e9f167e8104755a6e6c3b451be24dbb Mon Sep 17 00:00:00 2001
From 4245196c677145462c0bf13ce6eb3c30f084c60c Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:06:22 -0500
Subject: [PATCH] Configurable TPS Catchup

View File

@@ -1,4 +1,4 @@
From 2dcf0ebbe37697db1b17209d2dd1364fc1a4a696 Mon Sep 17 00:00:00 2001
From 54965452c27d06894f11126f02e0b9a3d36b0c9d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 19:46:44 -0500
Subject: [PATCH] Breedable Polar Bears

View File

@@ -1,4 +1,4 @@
From 9ffef8dbe642e3b08972f88ae1fc16d66c0ed38a Mon Sep 17 00:00:00 2001
From cf57c8ebaecc5422ce6efcdae1be945e9b724e60 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 21:39:32 -0500
Subject: [PATCH] Configurable jockey options

View File

@@ -1,4 +1,4 @@
From ef60eb5ac03b90034046500d8e74ee5802897b77 Mon Sep 17 00:00:00 2001
From 1eccc9c002bd9a1aae3dd8b3ebd19c49a43fa455 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 1 Apr 2020 17:21:42 -0500
Subject: [PATCH] Configurable enchantment max level

View File

@@ -1,4 +1,4 @@
From 58c64b9443b0e64821e51a524993a30cee2e95a9 Mon Sep 17 00:00:00 2001
From 182f093696b3a8b995c6b910146a30d0a7a9ad13 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Apr 2020 00:28:06 -0500
Subject: [PATCH] Optimize Chunk Ticks

View File

@@ -1,4 +1,4 @@
From d1e0d3d6862820cc51e8a17f7fa01d6e6de17678 Mon Sep 17 00:00:00 2001
From 2430452d433a1e3cbc45ccb0db6e7d0c0a3e3c28 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 2 Apr 2020 03:39:34 -0500
Subject: [PATCH] Add configurable beehive generation chance

View File

@@ -1,4 +1,4 @@
From e06b030290d85839f4b39afb0f36423df1ef6a84 Mon Sep 17 00:00:00 2001
From ac0b17650a47c0c66f4160c6e356757f81a7d680 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 02:36:45 -0500
Subject: [PATCH] Add more timings timers
@@ -45,7 +45,7 @@ index 434833d50e..cb27ed36e6 100644
private MinecraftTimings() {}
diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index bac6cea1ff..f9ca4280d4 100644
index 6a9d0ef0ef..15a5fb7139 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1,5 +1,7 @@

View File

@@ -1,4 +1,4 @@
From e41fce09a4489f7c24baae33b18fd19da6a01c96 Mon Sep 17 00:00:00 2001
From 95242419e6e4fe2a5560c24ca2bf76756abcf671 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 03:07:59 -0500
Subject: [PATCH] Skip events if there's no listeners
@@ -8,10 +8,10 @@ Subject: [PATCH] Skip events if there's no listeners
1 file changed, 2 insertions(+)
diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java
index 3b15f953bc..1a2213873a 100644
index b38a5223cb..ca701a2e68 100644
--- a/src/main/java/net/minecraft/server/CommandDispatcher.java
+++ b/src/main/java/net/minecraft/server/CommandDispatcher.java
@@ -256,6 +256,7 @@ public class CommandDispatcher {
@@ -255,6 +255,7 @@ public class CommandDispatcher {
map.put(this.b.getRoot(), rootcommandnode);
this.a(this.b.getRoot(), rootcommandnode, entityplayer.getCommandListener(), (Map) map);
@@ -19,7 +19,7 @@ index 3b15f953bc..1a2213873a 100644
Collection<String> bukkit = new LinkedHashSet<>();
for (CommandNode node : rootcommandnode.getChildren()) {
bukkit.add(node.getName());
@@ -271,6 +272,7 @@ public class CommandDispatcher {
@@ -270,6 +271,7 @@ public class CommandDispatcher {
}
}
// CraftBukkit end

View File

@@ -1,4 +1,4 @@
From 75a1b14282dee435f54f1b3798482afadd05e3aa Mon Sep 17 00:00:00 2001
From 9fb281ad4d375cdf7071b698c64d4d64c49cad20 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 4 Apr 2020 17:16:30 -0500
Subject: [PATCH] Debug stick should not update neighbors

View File

@@ -1,4 +1,4 @@
From f9dedbe5901d9cdfcee2616910fbe9b985bca3cf Mon Sep 17 00:00:00 2001
From 5b23f784db460c764a221b7a8851720d0483753a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 8 Apr 2020 23:01:20 -0500
Subject: [PATCH] Async recalc perms and command map

View File

@@ -1,4 +1,4 @@
From 24311a8d3beaedca9e542332e563c5b029bffa46 Mon Sep 17 00:00:00 2001
From 2758492060717405c630dcd65a289920a0e4a473 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 21 Feb 2020 17:04:51 -0600
Subject: [PATCH] MC-125757 Fix - Always increment arrow despawn counter

View File

@@ -1,4 +1,4 @@
From b513091baaf0d8d2542f42472bc0792d87bdbc49 Mon Sep 17 00:00:00 2001
From 23d28155773440b58ca0dafe292b65252082ebfa Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 22:15:46 -0500
Subject: [PATCH] MC-168772 Fix - Add turtle egg block options

View File

@@ -1,4 +1,4 @@
From 5c0028d941de9edc3c375adc57c3edb2200a2ec0 Mon Sep 17 00:00:00 2001
From d5fba49f71128ec363e9fb12ce82118208b87f0d Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 6 Jul 2019 21:12:58 -0500
Subject: [PATCH] MC-4 Fix - Item position desync

View File

@@ -1,4 +1,4 @@
From 8f6c4e1d4491b00d203c1a6fe50cf64ba6b45306 Mon Sep 17 00:00:00 2001
From 311ea9846ee3db629c705342683697ed85061215 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 9 Jul 2019 20:56:47 -0500
Subject: [PATCH] MC-56653 Fix - pig zombies aggro

View File

@@ -1,4 +1,4 @@
From ef7d15f9029f6d90d34ca9367ede9997d5cfaef9 Mon Sep 17 00:00:00 2001
From 91e0c05ca584782244fca7221d82f57abc807f99 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Sat, 20 Jul 2013 22:40:56 -0400
Subject: [PATCH] EMC - MonsterEggSpawn Event

View File

@@ -1,4 +1,4 @@
From 7f0089f85f89a5da06847080dd27f165abc5ba36 Mon Sep 17 00:00:00 2001
From f25a1e4b5ec346d76d1bae86faa9a3bf6905b240 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 02:02:07 -0600
Subject: [PATCH] EMC - Optimize Pathfinding

View File

@@ -1,4 +1,4 @@
From ffa5c033e7015a17872192e78acd535ad6b38c40 Mon Sep 17 00:00:00 2001
From 4c189c0f6cf26cc3fa4a21faf9a7f05b67c67847 Mon Sep 17 00:00:00 2001
From: Eearslya Sleiarion <eearslya@gmail.com>
Date: Mon, 24 Jun 2019 21:27:32 -0700
Subject: [PATCH] PaperPR - Add BellRingEvent

View File

@@ -1,4 +1,4 @@
From a88295b5511f3e93068d8218334c69ce92b36ed7 Mon Sep 17 00:00:00 2001
From 2565c9b3ba85972d51fc4b9c30a815cfa04f2a83 Mon Sep 17 00:00:00 2001
From: chase <chasewhip20@gmail.com>
Date: Sun, 15 Mar 2020 18:32:22 -0600
Subject: [PATCH] PaperPR - Per World Spawn limits

View File

@@ -1,4 +1,4 @@
From 7b8c9918096daf54b1c2ac4fdfab600551b58851 Mon Sep 17 00:00:00 2001
From 422d878acd677f420368f77dd5ffda99770d3d12 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 25 Oct 2019 02:11:30 -0700
Subject: [PATCH] Tuinity - Delay chunk unloads

View File

@@ -1,4 +1,4 @@
From e6aa72962f5d52ca162a51c8172c355e70c818ca Mon Sep 17 00:00:00 2001
From 4b2a8e61e9f9db64d47aa834a7781e76137480c8 Mon Sep 17 00:00:00 2001
From: Spottedleaf <spottedleaf@spottedleaf.dev>
Date: Thu, 26 Mar 2020 18:34:18 -0700
Subject: [PATCH] Tuinity - Don't run entity collision code if not needed

View File

@@ -1,4 +1,4 @@
From b946786fb894bc8fd19d8182179c85d8ed66024f Mon Sep 17 00:00:00 2001
From b59a3ec5facc9721fee2c2bdb3325249efcc9f44 Mon Sep 17 00:00:00 2001
From: Spottedleaf <spottedleaf@spottedleaf.dev>
Date: Fri, 3 Apr 2020 02:21:13 -0700
Subject: [PATCH] Tuinity - Always able to execute tasks on the main server

View File

@@ -1,4 +1,4 @@
From e56e6f36485ffce8e437523aed7befaa76c8de69 Mon Sep 17 00:00:00 2001
From e85cc101efc11c2140e7a4b8abb694628c922d38 Mon Sep 17 00:00:00 2001
From: tr7zw <tr7zw@live.de>
Date: Thu, 5 Mar 2020 23:08:01 +0100
Subject: [PATCH] YAPFA - Disable mojang profiler
@@ -160,16 +160,16 @@ index 7b7e1475b3..1136a0a26d 100644
// Paper start
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
index 4326c04b27..c16e603c97 100644
index e81beea7fa..5c3536b26b 100644
--- a/src/main/resources/purpur.lang
+++ b/src/main/resources/purpur.lang
@@ -1,5 +1,6 @@
{
"cannot.ride.mob": "You cannot mount that mob",
+ "commands.purpur.debug.disabled": "The debug profiler is disabled",
"commands.purpur.mspt": "§6Server tick times §e(§7avg§e/§7min§e/§7max§e)§6 from last 5s§7,§6 10s§7,§6 1m§e:",
"commands.purpur.mspt.times": "§6◴ %s§7/%s§7/%s§e, %s§7/%s§7/%s§e, %s§7/%s§7/%s",
"commands.purpur.ping": "§a%s's ping is %sms",
"idle.timeout.broadcast.away": "§e§o%s is now AFK",
"idle.timeout.broadcast.back": "§e§o%s is no longer AFK"
--
2.24.0

View File

@@ -1,4 +1,4 @@
From e843c88d0d91a40286f0f30777aac9ad33f09c58 Mon Sep 17 00:00:00 2001
From 755dd45501bc98e4cbb7729b9bd1024bff43fc6b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 12 Apr 2020 13:19:34 -0500
Subject: [PATCH] Chickens can retaliate