mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit) (#8158)

Browse source
This commit is contained in:
Jake Potrebic 2022-07-21 12:53:04 -07:00 • committed by GitHub
parent c6313e659c
commit d0e7fa4dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
142 changed files with 194 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

10
patches/api/0020-Add-exception-reporting-event.patch
View file

@ -492,10 +492,10 @@ index f99d71301ceaa3af07ff0525f7d657ac6253d0e6..2e23c124311b38aaea64dd274c33afcd
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 50a2e8c138c677c91dad65c850acf840f7517e86..b7cd4b9e4fd5f98aafbc0fe5ad6883eeb50dea56 100644
index 1bfa9fcb1b803eecfe33156f81ee88d2922ca88a..b535ab89b5a04371bac41720d28b4af8b18f1c20 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -487,7 +487,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -488,7 +488,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -505,7 +505,7 @@ index 50a2e8c138c677c91dad65c850acf840f7517e86..b7cd4b9e4fd5f98aafbc0fe5ad6883ee
}
HandlerList.bakeAll();
@@ -508,32 +509,37 @@ public final class SimplePluginManager implements PluginManager {
@@ -509,32 +510,37 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -548,7 +548,7 @@ index 50a2e8c138c677c91dad65c850acf840f7517e86..b7cd4b9e4fd5f98aafbc0fe5ad6883ee
}
try {
@@ -546,6 +552,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -547,6 +553,13 @@ public final class SimplePluginManager implements PluginManager {
}
}
@ -562,7 +562,7 @@ index 50a2e8c138c677c91dad65c850acf840f7517e86..b7cd4b9e4fd5f98aafbc0fe5ad6883ee
@Override
public void clearPlugins() {
synchronized (this) {
@@ -609,7 +622,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -610,7 +623,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {