Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 15:04:06 +01:00
Code Issues Projects Releases Wiki Activity

Try to determine plugin name on bad plugin command registration

Browse Source
This commit is contained in:
Aikar 2016-04-30 12:53:20 -04:00
parent 5f98ec08a5
commit 776e0784af
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Spigot-API-Patches/0003-Timings-v2.patch
View File

@ -1,4 +1,4 @@
From 318744eb013e35f3f25e5195870f7dd649cbf5d2 Mon Sep 17 00:00:00 2001 From b005a8e4ac2677606ef91377f4b4d66bc869b0ad Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Mon, 29 Feb 2016 18:48:17 -0600 Date: Mon, 29 Feb 2016 18:48:17 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -1921,10 +1921,10 @@ index 0000000..17f8c6f
+} +}
diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
new file mode 100644 new file mode 100644
index 0000000..67c39df index 0000000..58ed35e
--- /dev/null --- /dev/null
+++ b/src/main/java/co/aikar/timings/TimingsManager.java +++ b/src/main/java/co/aikar/timings/TimingsManager.java
@@ -0,0 +1,194 @@ @@ -0,0 +1,196 @@
+/* +/*
+ * This file is licensed under the MIT License (MIT). + * This file is licensed under the MIT License (MIT).
+ * + *
@ -2085,14 +2085,16 @@ index 0000000..67c39df
+ public static Timing getCommandTiming(String pluginName, Command command) { + public static Timing getCommandTiming(String pluginName, Command command) {
+ Plugin plugin = null; + Plugin plugin = null;
+ final Server server = Bukkit.getServer(); + final Server server = Bukkit.getServer();
+ if (!("minecraft".equals(pluginName) || "bukkit".equals(pluginName) || "Spigot".equals(pluginName) || + if (!( server == null || pluginName == null ||
+ server == null)) { + "minecraft".equals(pluginName) || "bukkit".equals(pluginName) ||
+ "spigot".equalsIgnoreCase(pluginName) || "paper".equals(pluginName)
+ )) {
+ plugin = server.getPluginManager().getPlugin(pluginName); + plugin = server.getPluginManager().getPlugin(pluginName);
+ }
+ if (plugin == null) { + if (plugin == null) {
+ // Plugin is passing custom fallback prefix, try to look up by class loader + // Plugin is passing custom fallback prefix, try to look up by class loader
+ plugin = getPluginByClassloader(command.getClass()); + plugin = getPluginByClassloader(command.getClass());
+ } + }
+ }
+ if (plugin == null) { + if (plugin == null) {
+ return Timings.ofSafe("Command: " + pluginName + ":" + command.getTimingName()); + return Timings.ofSafe("Command: " + pluginName + ":" + command.getTimingName());
+ } + }
@ -2871,7 +2873,7 @@ index 69720e9..f82cbaf 100644
* Sends the component to the player * Sends the component to the player
* *
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 0ba9b1c..29762b0 100644 index 0ba9b1c..b2684fc 100644
--- a/src/main/java/org/bukkit/command/Command.java --- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java +++ b/src/main/java/org/bukkit/command/Command.java
@@ -31,7 +31,8 @@ public abstract class Command { @@ -31,7 +31,8 @@ public abstract class Command {
@ -2906,7 +2908,7 @@ index 0ba9b1c..29762b0 100644
this.commandMap = commandMap; this.commandMap = commandMap;
+ // Paper start - Some plugins do things the wrong way, try and account for that + // Paper start - Some plugins do things the wrong way, try and account for that
+ if (this.timings == null) { + if (this.timings == null) {
+ this.timings = co.aikar.timings.TimingsManager.getCommandTiming("unknown", this); + this.timings = co.aikar.timings.TimingsManager.getCommandTiming(null, this);
+ } + }
+ // Paper end + // Paper end
return true; return true;
@ -3593,5 +3595,5 @@ index 8d98297..7e89b97 100644
- } - }
} }
-- --
2.8.0 2.8.1