This commit is contained in:
Nassim Jahnke 2024-04-23 21:23:27 +02:00
parent 380c4d2313
commit 7cdf804392
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
23 changed files with 199 additions and 502 deletions

View file

@ -496,10 +496,10 @@ index 4205649948a9e2a72f64c3f007112245abac6d50..b3b32ce429edbf1ed040354dbe28ab86
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index f896cfb30b967b9c21ee94893534201123e6ec72..2ff417f91492a441085ac1b7ddd248726f05de0a 100644
index ca539930905531a4ce079529c4d456bcb6fc9e8c..07a9c9e254188c251165ca84c8e961fccda01175 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -526,7 +526,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -527,7 +527,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -509,7 +509,7 @@ index f896cfb30b967b9c21ee94893534201123e6ec72..2ff417f91492a441085ac1b7ddd24872
}
HandlerList.bakeAll();
@@ -549,32 +550,37 @@ public final class SimplePluginManager implements PluginManager {
@@ -550,32 +551,37 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -552,7 +552,7 @@ index f896cfb30b967b9c21ee94893534201123e6ec72..2ff417f91492a441085ac1b7ddd24872
}
try {
@@ -587,6 +593,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -588,6 +594,13 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -566,7 +566,7 @@ index f896cfb30b967b9c21ee94893534201123e6ec72..2ff417f91492a441085ac1b7ddd24872
@Override
public void clearPlugins() {
if (true) {this.paperPluginManager.clearPlugins(); return;} // Paper
@@ -652,7 +665,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -653,7 +666,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {