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

Update Upstream

Browse source
This commit is contained in:
Spottedleaf 2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Spigot-API-Patches/0017-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From d8a7d90df073f104820ab655dcf7d682a993361c Mon Sep 17 00:00:00 2001
From 4b0e39e1270afcb0a08bc1d74935aa363ee79c56 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Mon, 29 Feb 2016 20:24:35 -0600
Subject: [PATCH] Add exception reporting event
@ -462,7 +462,7 @@ index 00000000..5582999f
+ }
+}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 9d0ae63f..911d90fd 100644
index f020cb04..adfc7aae 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -8,6 +8,10 @@ import java.util.HashMap;
@ -476,7 +476,7 @@ index 9d0ae63f..911d90fd 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Location;
import org.bukkit.Server;
@@ -151,11 +155,14 @@ public class SimpleCommandMap implements CommandMap {
@@ -155,11 +159,14 @@ public class SimpleCommandMap implements CommandMap {
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
} // target.timings.stopTiming(); // Spigot // Paper
} catch (CommandException ex) {
@ -492,7 +492,7 @@ index 9d0ae63f..911d90fd 100644
}
// return true as command was handled
@@ -230,7 +237,9 @@ public class SimpleCommandMap implements CommandMap {
@@ -238,7 +245,9 @@ public class SimpleCommandMap implements CommandMap {
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {
@ -504,7 +504,7 @@ index 9d0ae63f..911d90fd 100644
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 47327376..ef38b2af 100644
index 78a2d2f8..aa0c809a 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -19,6 +19,10 @@ import java.util.WeakHashMap;
@ -518,7 +518,7 @@ index 47327376..ef38b2af 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Server;
import org.bukkit.command.Command;
@@ -406,7 +410,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -414,7 +418,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -528,7 +528,7 @@ index 47327376..ef38b2af 100644
}
HandlerList.bakeAll();
@@ -425,36 +430,48 @@ public final class SimplePluginManager implements PluginManager {
@@ -435,36 +440,48 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -579,10 +579,10 @@ index 47327376..ef38b2af 100644
+ }
+ // Paper end
+
@Override
public void clearPlugins() {
synchronized (this) {
disablePlugins();
@@ -519,7 +536,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -531,7 +548,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {