Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-24 01:19:25 +00:00
Code Issues Releases Activity

Updated Upstream (Gale/Purpur/Leaves)

Browse Source
This commit is contained in:
Dreeam
2024-06-14 03:18:51 +08:00
parent 8742091121
commit 2e32ca3a7a
55 changed files with 281 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
patches/api/0005-Remove-Timings.patch
View File

@@ -720,10 +720,10 @@ index 51d54b87106aa17c2de9ab22eae22d176c7d0bfc..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..0000000000000000000000000000000000000000
--- a/src/main/java/co/aikar/timings/TimingHistory.java
+++ /dev/null
@@ -1,355 +0,0 @@
@@ -1,352 +0,0 @@
-/*
- * This file is licensed under the MIT License (MIT).
- *
@@ -877,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()
- );
- }
- )
- );
@@ -2830,7 +2827,7 @@ index 3e61a926620a67daec3af54b72a1b911eaef2ed4..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
index 0857a65ecbc36e0e4b8a7d0cda52be35f238f660..eabc229dd6c2cdfcc7d533e0eae44e97070922ba 100644
index 0e9ccfee7a03d341e7c4d271f53b4ed168b404ef..1a38d70284e3644ba4bad87061974e58761c5a37 100644
--- a/src/main/java/org/bukkit/UnsafeValues.java
+++ b/src/main/java/org/bukkit/UnsafeValues.java
@@ -151,7 +151,8 @@ public interface UnsafeValues {
@@ -2907,10 +2904,10 @@ index abe256e1e45ce28036da4aa1586715bc8a1a3414..9eab8024e0675865f17669847759a26d
return i >= j && i <= k;
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 83f84a76cbfdf5138ecccf3a886d38151a500bf2..4ba2d258114259691a453c03751b5b7fa3d6b525 100644
index a09b5458191eb5df4787859b72a37fa1fa2bffba..6551a74b5c900d52f162c38c2b2ca94a8fc5c444 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
@@ -2918,15 +2915,15 @@ index 83f84a76cbfdf5138ecccf3a886d38151a500bf2..4ba2d258114259691a453c03751b5b7f
}
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);
@@ -165,23 +163,13 @@ public class SimpleCommandMap implements CommandMap {
@@ -166,23 +164,13 @@ public class SimpleCommandMap implements CommandMap {
parsedArgs = event.getArgs();
// Purpur end
@@ -2951,10 +2948,10 @@ index 83f84a76cbfdf5138ecccf3a886d38151a500bf2..4ba2d258114259691a453c03751b5b7f
server.getPluginManager().callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
throw new CommandException(msg, ex);
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 5dc64d8c9aeae612fd31af0673f3530a9e777dfc..b598ad80bbcc256c1440a5ab79321b93ae9f12ed 100644
index e8ba4f1108f2548a487877027e37d81fc150e042..bfb3a06abc8c9b24cb217946f8f77d7027c8dbc1 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -60,7 +60,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -61,7 +61,6 @@ public final class SimplePluginManager implements PluginManager {
public final Map<Boolean, Map<Permissible, Boolean>> defSubs = new HashMap<Boolean, Map<Permissible, Boolean>>();
public PluginManager paperPluginManager;
// Paper end
@@ -2962,7 +2959,7 @@ index 5dc64d8c9aeae612fd31af0673f3530a9e777dfc..b598ad80bbcc256c1440a5ab79321b93
public SimplePluginManager(@NotNull Server instance, @NotNull SimpleCommandMap commandMap) {
server = instance;
@@ -723,12 +722,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -724,12 +723,7 @@ public final class SimplePluginManager implements PluginManager {
throw new IllegalPluginAccessException("Plugin attempted to register " + event + " while not enabled");
}
@@ -2976,7 +2973,7 @@ index 5dc64d8c9aeae612fd31af0673f3530a9e777dfc..b598ad80bbcc256c1440a5ab79321b93
}
@NotNull
@@ -958,17 +952,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -959,17 +953,7 @@ public final class SimplePluginManager implements PluginManager {
@Override
public boolean useTimings() {
@@ -3117,7 +3114,7 @@ index 12946bd55fcf7c40d39081779a7fa30049ee6165..00000000000000000000000000000000
-
-}
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index 88f1ca89fa640a686231b8eec87e70419b2d73ef..ef113b3b89f40ed7242d5c6361ea822693f87518 100644
index 057dc3ebea3516863dda24252fe05d344c16fab3..3d0c2ef20810ff2dad479e84e6987ec47bada56f 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -50,15 +50,6 @@ public class AnnotationTest {