Skip to content

Commit

Permalink
Restore removed lines
Browse files Browse the repository at this point in the history
  • Loading branch information
@kashike
kashike committed Jul 21, 2024
1 parent 38e61d0 commit 1ef60be
Show file tree
Hide file tree
Showing 41 changed files with 143 additions and 140 deletions.
77 changes: 40 additions & 37 deletions patches/api/0011-Timings-v2.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2870,14 +2870,15 @@ index 0000000000000000000000000000000000000000..3e61a926620a67daec3af54b72a1b911
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index fe6c43405e3f11272c1ff015f1dcd47129a68d41..8d729fb196d83e01e4652fb1f77f5cab7b57cc31 100644
index fe6c43405e3f11272c1ff015f1dcd47129a68d41..a0d7dae18d0a85a786ad46787db64d0369eb9f62 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -870,7 +870,6 @@ public final class Bukkit {
@@ -870,7 +870,7 @@ public final class Bukkit {
*/
public static void reload() {
server.reload();
- org.spigotmc.CustomTimingsHandler.reload(); // Spigot
+ // org.spigotmc.CustomTimingsHandler.reload(); // Spigot // Paper
}

/**
Expand Down Expand Up @@ -2913,27 +2914,21 @@ index fa6ad07214d5e38866bf6bee9139c6c938e9f51a..57c9b560c77a56588870598acb543469
* Sends the component to the player
*
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index d8b346fe0f9634218954fe818d53272a0896af9c..12ef99f1c91b92a133611c5f5aeaaeebd02ce232 100644
index d8b346fe0f9634218954fe818d53272a0896af9c..aecd0097678d7668296cbaf1e800a7b9e37a992d 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -40,6 +40,11 @@ public interface UnsafeValues {
net.kyori.adventure.text.Component resolveWithContext(net.kyori.adventure.text.Component component, org.bukkit.command.CommandSender context, org.bukkit.entity.Entity scoreboardSubject, boolean bypassPermissions) throws java.io.IOException;
@@ -151,4 +151,18 @@ public interface UnsafeValues {
return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
}
// Paper end

+
+ // Paper start
+ /**
+ * @deprecated Timings will be removed in the future
+ */
+ @Deprecated(forRemoval = true)
+ void reportTimings(); // Paper
Material toLegacy(Material material);

Material fromLegacy(Material material);
@@ -151,4 +156,12 @@ public interface UnsafeValues {
return !Bukkit.getUnsafe().isSupportedApiVersion(plugin.getDescription().getAPIVersion());
}
// Paper end
+ void reportTimings();
+
+ // Paper start
+ /**
+ * @deprecated Timings will be removed in the future
+ */
Expand Down Expand Up @@ -2973,7 +2968,7 @@ index 0000000000000000000000000000000000000000..45ed63797b13e114bf3795c80a6c3967
+ }
+}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index f3cdf13f22aa789ee8cc235b61fda4035b254219..17d3da22e8fcdf73a587b17a0cdac3b23ded3567 100644
index f3cdf13f22aa789ee8cc235b61fda4035b254219..87f747c75f815d7cde0773d9b1ac67013898f9e5 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -33,7 +33,16 @@ public abstract class Command {
Expand All @@ -2994,19 +2989,21 @@ index f3cdf13f22aa789ee8cc235b61fda4035b254219..17d3da22e8fcdf73a587b17a0cdac3b2

protected Command(@NotNull String name) {
this(name, "", "/" + name, new ArrayList<String>());
@@ -47,7 +56,6 @@ public abstract class Command {
@@ -47,7 +56,7 @@ public abstract class Command {
this.usageMessage = (usageMessage == null) ? "/" + name : usageMessage;
this.aliases = aliases;
this.activeAliases = new ArrayList<String>(aliases);
- this.timings = new org.spigotmc.CustomTimingsHandler("** Command: " + name); // Spigot
+ // this.timings = new org.spigotmc.CustomTimingsHandler("** Command: " + name); // Spigot // Paper
}

/**
@@ -245,7 +253,6 @@ public abstract class Command {
@@ -245,7 +254,7 @@ public abstract class Command {
}
this.nextLabel = name;
if (!isRegistered()) {
- this.timings = new org.spigotmc.CustomTimingsHandler("** Command: " + name); // Spigot
+ // this.timings = new org.spigotmc.CustomTimingsHandler("** Command: " + name); // Spigot // Paper
this.label = name;
return true;
}
Expand Down Expand Up @@ -3178,7 +3175,7 @@ index 0000000000000000000000000000000000000000..946d2f0ef37c6cf895caf8d3c6963c78
+
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..36fc2c35395c72f8b81a2a2f3265fd205384ce26 100644
index 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..3cd5ef2680b8fc286bbefe3f9e29bd9099091f5d 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -16,7 +16,6 @@ import org.bukkit.command.defaults.BukkitCommand;
Expand Down Expand Up @@ -3225,11 +3222,11 @@ index 9207ae900cb4cc8ce41dd4e63d7ad8b35b0ac048..36fc2c35395c72f8b81a2a2f3265fd20
+ } // target.timings.stopTiming(); // Spigot // Paper
} catch (CommandException ex) {
- target.timings.stopTiming(); // Spigot
+ //target.timings.stopTiming(); // Spigot // Paper
+ // target.timings.stopTiming(); // Spigot // Paper
throw ex;
} catch (Throwable ex) {
- target.timings.stopTiming(); // Spigot
+ //target.timings.stopTiming(); // Spigot // Paper
+ // target.timings.stopTiming(); // Spigot // Paper
throw new CommandException("Unhandled exception executing '" + commandLine + "' in " + target, ex);
}

Expand Down Expand Up @@ -3514,18 +3511,19 @@ index 5bcec42a91859002409cab9756999e5adc4c867f..3594b0eb4068c83c93efe948a8ef4ba2

@NotNull
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15dc2730cb 100644
index 46c7be5fa69f13900860b9944523beea16f2409b..b512891ab9b5e259c2c56e6b323a01e11d9ce5a6 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -381,7 +381,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -381,7 +381,7 @@ public final class SimplePluginManager implements PluginManager {
}
}

- org.bukkit.command.defaults.TimingsCommand.timingStart = System.nanoTime(); // Spigot
+ // org.bukkit.command.defaults.TimingsCommand.timingStart = System.nanoTime(); // Spigot // Paper
return result.toArray(new Plugin[result.size()]);
}

@@ -429,9 +428,9 @@ public final class SimplePluginManager implements PluginManager {
@@ -429,9 +429,9 @@ public final class SimplePluginManager implements PluginManager {

if (result != null) {
plugins.add(result);
Expand All @@ -3537,7 +3535,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
}
}

@@ -461,7 +460,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -461,7 +461,7 @@ public final class SimplePluginManager implements PluginManager {
@Nullable
public synchronized Plugin getPlugin(@NotNull String name) {
if (true) {return this.paperPluginManager.getPlugin(name);} // Paper
Expand All @@ -3546,7 +3544,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
}

@Override
@@ -689,7 +688,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -689,7 +689,8 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}

Expand All @@ -3556,7 +3554,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
getEventListeners(event).register(new TimedRegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
} else {
getEventListeners(event).register(new RegisteredListener(listener, executor, priority, plugin, ignoreCancelled));
@@ -924,7 +924,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -924,7 +925,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
if (true) {return this.paperPluginManager.useTimings();} // Paper
Expand All @@ -3565,7 +3563,7 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15
}

/**
@@ -933,7 +933,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -933,7 +934,7 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {
Expand All @@ -3575,40 +3573,45 @@ index 46c7be5fa69f13900860b9944523beea16f2409b..6018574cd15b802833613beefa88da15

// Paper start
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..de6b6188587fd254ab96cbc1f95fda2056d9cbe2 100644
index ab04ffe4cd05315a2ee0f64c553b4c674740eb7f..4ce7421885cb2ade1fb989a6811cbd607c99e76d 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -55,7 +55,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -55,7 +55,7 @@ public final class JavaPluginLoader implements PluginLoader {
private final Pattern[] fileFilters = new Pattern[]{Pattern.compile("\\.jar$")};
private final List<PluginClassLoader> loaders = new CopyOnWriteArrayList<PluginClassLoader>();
private final LibraryLoader libraryLoader;
- public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot
+ // public static final CustomTimingsHandler pluginParentTimer = new CustomTimingsHandler("** Plugins"); // Spigot // Paper

/**
* This class was not meant to be constructed explicitly
@@ -294,27 +293,21 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -294,8 +294,9 @@ public final class JavaPluginLoader implements PluginLoader {
}
}

- final CustomTimingsHandler timings = new CustomTimingsHandler("Plugin: " + plugin.getDescription().getFullName() + " Event: " + listener.getClass().getName() + "::" + method.getName() + "(" + eventClass.getSimpleName() + ")", pluginParentTimer); // Spigot
- EventExecutor executor = new EventExecutor() {
+ // final CustomTimingsHandler timings = new CustomTimingsHandler("Plugin: " + plugin.getDescription().getFullName() + " Event: " + listener.getClass().getName() + "::" + method.getName() + "(" + eventClass.getSimpleName() + ")", pluginParentTimer); // Spigot // Paper
+ // EventExecutor executor = new EventExecutor() { // Paper
+ EventExecutor executor = new co.aikar.timings.TimedEventExecutor(new EventExecutor() { // Paper
@Override
- public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
+ public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException { // Paper
public void execute(@NotNull Listener listener, @NotNull Event event) throws EventException {
try {
if (!eventClass.isAssignableFrom(event.getClass())) {
@@ -303,10 +304,10 @@ public final class JavaPluginLoader implements PluginLoader {
return;
}
- // Spigot start
// Spigot start
- boolean isAsync = event.isAsynchronous();
- if (!isAsync) timings.startTiming();
+ // boolean isAsync = event.isAsynchronous(); // Paper
+ // if (!isAsync) timings.startTiming(); // Paper
method.invoke(listener, event);
- if (!isAsync) timings.stopTiming();
- // Spigot end
+ // if (!isAsync) timings.stopTiming(); // Paper
// Spigot end
} catch (InvocationTargetException ex) {
throw new EventException(ex.getCause());
} catch (Throwable t) {
@@ -314,7 +315,7 @@ public final class JavaPluginLoader implements PluginLoader {
throw new EventException(t);
}
}
Expand Down
10 changes: 5 additions & 5 deletions patches/api/0012-Add-command-line-option-to-load-extra-plugin-jars-no.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar

diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 6ecab28705afc0e3652677b516d8a5398e8b2666..db51751d2dc1ac419e8fac32466ad3a7727fa2fe 100644
index a0d7dae18d0a85a786ad46787db64d0369eb9f62..2c70f43adda1a27b2db93b8f31085513038272a5 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -83,6 +83,20 @@ public final class Bukkit {
Expand All @@ -32,7 +32,7 @@ index 6ecab28705afc0e3652677b516d8a5398e8b2666..db51751d2dc1ac419e8fac32466ad3a7
* Attempts to set the {@link Server} singleton.
* <p>
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index f4b2ad91c7a46af5fc16f31369d155e4e3ab3aae..638e98416fdf7ac065abe058d625b1c924be5abb 100644
index 57c9b560c77a56588870598acb543469040ceec1..8949b8e29ae7f412481291630a5cb7b5b8809842 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -68,6 +68,18 @@ import org.jetbrains.annotations.Nullable;
Expand All @@ -55,7 +55,7 @@ index f4b2ad91c7a46af5fc16f31369d155e4e3ab3aae..638e98416fdf7ac065abe058d625b1c9
* Used for all administrative messages, such as an operator using a
* command.
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 6018574cd15b802833613beefa88da15dc2730cb..e7b1895d3918487d711afcbe41d76863d85c0a62 100644
index b512891ab9b5e259c2c56e6b323a01e11d9ce5a6..095480a8232e434c840b00b8db661641c7592baa 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -117,9 +117,22 @@ public final class SimplePluginManager implements PluginManager {
Expand All @@ -82,10 +82,10 @@ index 6018574cd15b802833613beefa88da15dc2730cb..e7b1895d3918487d711afcbe41d76863
}
Preconditions.checkArgument(directory != null, "Directory cannot be null");
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index de6b6188587fd254ab96cbc1f95fda2056d9cbe2..eaefbb00e9993d54906cc8cf35cf753c0d6c7707 100644
index 4ce7421885cb2ade1fb989a6811cbd607c99e76d..e265a7d4071d4c1e88a9437d2811d3e62d0e8304 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -93,7 +93,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -94,7 +94,7 @@ public final class JavaPluginLoader implements PluginLoader {
throw new InvalidPluginException(ex);
}

Expand Down
4 changes: 2 additions & 2 deletions patches/api/0014-Add-getTPS-method.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Add getTPS method


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index d978c72cdbc10792f852a4ba372518073893d02b..5780003631beae773231afe3afc6b834bfe1f84d 100644
index 2c70f43adda1a27b2db93b8f31085513038272a5..4cfaa571e50d7931a1a61e25cc4ca32a86010567 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2108,6 +2108,17 @@ public final class Bukkit {
@@ -2109,6 +2109,17 @@ public final class Bukkit {
return server.getEntity(uuid);
}

Expand Down
6 changes: 3 additions & 3 deletions patches/api/0015-Expose-server-build-information.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 5780003631beae773231afe3afc6b834bfe1f84d..a005d5f8879262c763d8c4fbd09b9a99810d5e8c 100644
index 4cfaa571e50d7931a1a61e25cc4ca32a86010567..4d29bee57960e9c736217a282dca2552ac2a8986 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -110,13 +110,26 @@ public final class Bukkit {
Expand Down Expand Up @@ -312,10 +312,10 @@ index ba28d9f3213ca4b5f15178dc637bff37a8896edc..8a07f21eeb04fb54032ce377a1478f60
* Gets a view of all currently logged in players. This {@linkplain
* Collections#unmodifiableCollection(Collection) view} is a reused
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index 12ef99f1c91b92a133611c5f5aeaaeebd02ce232..6e67fdb091a006d2d13bc2d93db4d55348af4c8f 100644
index aecd0097678d7668296cbaf1e800a7b9e37a992d..96aca49450d58181aa1dd325c87ed3ea33a93424 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -163,5 +163,12 @@ public interface UnsafeValues {
@@ -164,5 +164,12 @@ public interface UnsafeValues {
*/
@Deprecated(forRemoval = true)
String getTimingsServerName();
Expand Down
4 changes: 2 additions & 2 deletions patches/api/0019-Expose-server-CommandMap.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Expose server CommandMap


diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index a005d5f8879262c763d8c4fbd09b9a99810d5e8c..26f3ac9c15ff554becfe8ea53a48f67b2de60ed6 100644
index 4d29bee57960e9c736217a282dca2552ac2a8986..2fc3fe215bcc90e1f9650b1b095febe55c89cf6e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2337,6 +2337,19 @@ public final class Bukkit {
@@ -2338,6 +2338,19 @@ public final class Bukkit {
return server.getUnsafe();
}

Expand Down
Loading

0 comments on commit 1ef60be

Please sign in to comment.