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

Update B/CB/S

Browse source
This commit is contained in:
Shane Freeder 2017-11-08 16:13:57 +00:00
parent d1d4f3b465
commit 1d03f56bd6
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
38 changed files with 216 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Spigot-API-Patches/0018-Add-exception-reporting-event.patch
View file

@ -1,4 +1,4 @@
From 04898a9642c98cc38ace2c8862794f1710081a7d Mon Sep 17 00:00:00 2001
From 95df32df8d98c5ca8434f09312bade707628c21c 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
@ -458,7 +458,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 b886cd82..f1e9f200 100644
index bdc0de8c..762eb1d2 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -10,6 +10,9 @@ import java.util.List;
@ -494,7 +494,7 @@ index b886cd82..f1e9f200 100644
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 041a4cd7..68dd3332 100644
index 80c152ba..b88f31ca 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -18,6 +18,9 @@ import java.util.logging.Level;
@ -507,7 +507,7 @@ index 041a4cd7..68dd3332 100644
import org.apache.commons.lang.Validate;
import org.bukkit.Server;
import org.bukkit.command.Command;
@@ -400,7 +403,8 @@ public final class SimplePluginManager implements PluginManager {
@@ -401,7 +404,8 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().enablePlugin(plugin);
} catch (Throwable ex) {
@ -517,7 +517,7 @@ index 041a4cd7..68dd3332 100644
}
HandlerList.bakeAll();
@@ -419,36 +423,48 @@ public final class SimplePluginManager implements PluginManager {
@@ -420,36 +424,48 @@ public final class SimplePluginManager implements PluginManager {
try {
plugin.getPluginLoader().disablePlugin(plugin);
} catch (Throwable ex) {
@ -571,7 +571,7 @@ index 041a4cd7..68dd3332 100644
public void clearPlugins() {
synchronized (this) {
disablePlugins();
@@ -510,7 +526,13 @@ public final class SimplePluginManager implements PluginManager {
@@ -511,7 +527,13 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {
@ -587,5 +587,5 @@ index 041a4cd7..68dd3332 100644
}
}
--
2.13.0
2.14.3