Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-31 04:46:29 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-06-13 23:13:38 +08:00
parent 2a7fc43064
commit e234432bd9
28 changed files with 98 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
patches/api/0007-Delete-Timings.patch
View File

@@ -720,11 +720,10 @@ index 199789d56d22fcb1b77ebd56805cc28aa5a5ab0a..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
deleted file mode 100644
index 02e88db63be2d5e31da6b65157ba7b971b1f10f3..0000000000000000000000000000000000000000
index 2d87237ea99d42c6ce896d52a1b2e5c3ec4d4568..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/main/java/co/aikar/timings/TimingHistory.java
+++ /dev/null
@@ -1,355 +0,0 @@
+++ b/src/main/java/co/aikar/timings/TimingHistory.java
@@ -1,352 +0,0 @@
-/*
- * This file is licensed under the MIT License (MIT).
- *
@@ -878,17 +877,14 @@ index 02e88db63be2d5e31da6b65157ba7b971b1f10f3..00000000000000000000000000000000
- }
- }
- ),
- toObjectMapper(input.tileEntityCounts.entrySet(),
- new Function<Map.Entry<Material, Counter>, JSONPair>() {
- @NotNull
- @Override
- public JSONPair apply(Map.Entry<Material, Counter> entry) {
- tileEntityTypeSet.add(entry.getKey());
- return pair(
- String.valueOf(entry.getKey().ordinal()),
- entry.getValue().count()
- );
- }
- toObjectMapper(
- input.tileEntityCounts.entrySet(),
- entry -> {
- tileEntityTypeSet.add(entry.getKey());
- return pair(
- String.valueOf(entry.getKey().ordinal()),
- entry.getValue().count()
- );
- }
- )
- );
@@ -2114,10 +2110,10 @@ index abe256e1e45ce28036da4aa1586715bc8a1a3414..b359306500e640f4b0761ae9aa996cf6
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..014f9c30440981d251e54b289682015baae1fe90 100644
index 5df19bd701c67506689fc7f49d91f99ebfbc83f0..940565704d0e8914a76cf25daf7d1f5ecd99bad4 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -38,7 +38,6 @@ public class SimpleCommandMap implements CommandMap {
@@ -39,7 +39,6 @@ public class SimpleCommandMap implements CommandMap {
register("bukkit", new VersionCommand("version"));
register("bukkit", new ReloadCommand("reload"));
//register("bukkit", new PluginsCommand("plugins")); // Paper
@@ -2125,15 +2121,15 @@ index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..014f9c30440981d251e54b289682015b
}
public void setFallbackCommands() {
@@ -70,7 +69,6 @@ public class SimpleCommandMap implements CommandMap {
@@ -71,7 +70,6 @@ public class SimpleCommandMap implements CommandMap {
*/
@Override
public boolean register(@NotNull String label, @NotNull String fallbackPrefix, @NotNull Command command) {
- command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Paper
label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
label = label.toLowerCase(Locale.ROOT).trim();
fallbackPrefix = fallbackPrefix.toLowerCase(Locale.ROOT).trim();
boolean registered = register(label, command, false, fallbackPrefix);
@@ -152,17 +150,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -153,17 +151,9 @@ public class SimpleCommandMap implements CommandMap {
return false;
}
@@ -2152,10 +2148,10 @@ index c3a9cf65db73ed534bf20996c7f05b5eb0aaebe1..014f9c30440981d251e54b289682015b
server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
//target.timings.stopTiming(); // Spigot // Paper
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 07a9c9e254188c251165ca84c8e961fccda01175..9eb02f8fb4d581349c4752ccb396dc4fdbd940c3 100644
index 003bece642b682985625db93cad93026352bfc66..308245714a0a830d92568f7bb1f4bb9c45828345 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -719,12 +719,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -720,12 +720,7 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@@ -2169,7 +2165,7 @@ index 07a9c9e254188c251165ca84c8e961fccda01175..9eb02f8fb4d581349c4752ccb396dc4f
}
@NotNull
@@ -954,8 +949,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -955,8 +950,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
@@ -2179,7 +2175,7 @@ index 07a9c9e254188c251165ca84c8e961fccda01175..9eb02f8fb4d581349c4752ccb396dc4f
}
/**
@@ -964,7 +958,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -965,7 +959,6 @@ public final class SimplePluginManager implements PluginManager {
* @param use True if per event timing code should be used
*/
public void useTimings(boolean use) {