Updated Upstream (Bukkit/CraftBukkit/Spigot)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 93e39ce1 Clarify documentation regarding getMaterial with legacyName = true c3aeaea0 Improve dependency tracker 14c9d275 Add support for transitive depends in load access warning c8afe560 SPIGOT-5526: Add EntityEnterBlockEvent 6bb6f07d SPIGOT-5548: Show error that hints towards plugins misusing reflection ed75537d SPIGOT-5546: Fix bad depend access using wrong provider in message 4e4c0ee9 Fix buggy classloader warning triggering for all classes 89586a4c Print warning when loading classes from depends that have not been specified d4fe9680 Fix bug where disablePlugin could remove ConfigurationSerializable classes from other plugins 85e683b7 Add additional checkstyle checks 612fd8e1 Correct max page count in BookMeta docs fa8a9781 Correct max title length in BookMeta docs CraftBukkit Changes: ab13a117 SPIGOT-5550: Cancelled ProjectileLaunchEvent still plays sound for eggs 44016b1d SPIGOT-5538: Using javaw to run GUI prints input error e653ae76 SPIGOT-5526: Call EntityEnterBlockEvent for bees trying to enter hives 6515ea49 SPIGOT-5537: Bee nests generated by growing trees near flower have no bees d82b3149 Remove unused CraftWorld.getId method 10763a88 Change some block == AIR checks to isAir to catch CAVE_AIR Spigot Changes: f2c1cd15 Rebuild patches bcd458ad Reformat patches
This commit is contained in:
parent
c9eebbb802
commit
5792c8626a
74 changed files with 596 additions and 597 deletions
|
@ -1,4 +1,4 @@
|
|||
From a838f3134bc88bddefc502559b123c6ce1e39bab Mon Sep 17 00:00:00 2001
|
||||
From f29af31242cefc4315ca2a927877402fdb573e7b 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
|
||||
|
@ -506,10 +506,10 @@ index f020cb04..adfc7aae 100644
|
|||
}
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
index 53e5045f..9a09b4d2 100644
|
||||
index 3c5d8a0e..861d808c 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;
|
||||
@@ -23,6 +23,10 @@ import java.util.WeakHashMap;
|
||||
import java.util.logging.Level;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
@ -520,7 +520,7 @@ index 53e5045f..9a09b4d2 100644
|
|||
import org.apache.commons.lang.Validate;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.World;
|
||||
@@ -415,7 +419,8 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -430,7 +434,8 @@ public final class SimplePluginManager implements PluginManager {
|
||||
try {
|
||||
plugin.getPluginLoader().enablePlugin(plugin);
|
||||
} catch (Throwable ex) {
|
||||
|
@ -530,7 +530,7 @@ index 53e5045f..9a09b4d2 100644
|
|||
}
|
||||
|
||||
HandlerList.bakeAll();
|
||||
@@ -436,32 +441,37 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -451,32 +456,37 @@ public final class SimplePluginManager implements PluginManager {
|
||||
try {
|
||||
plugin.getPluginLoader().disablePlugin(plugin);
|
||||
} catch (Throwable ex) {
|
||||
|
@ -573,7 +573,7 @@ index 53e5045f..9a09b4d2 100644
|
|||
}
|
||||
|
||||
try {
|
||||
@@ -474,6 +484,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -489,6 +499,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -587,7 +587,7 @@ index 53e5045f..9a09b4d2 100644
|
|||
@Override
|
||||
public void clearPlugins() {
|
||||
synchronized (this) {
|
||||
@@ -540,7 +557,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
@@ -556,7 +573,13 @@ public final class SimplePluginManager implements PluginManager {
|
||||
));
|
||||
}
|
||||
} catch (Throwable ex) {
|
||||
|
@ -603,5 +603,5 @@ index 53e5045f..9a09b4d2 100644
|
|||
}
|
||||
}
|
||||
--
|
||||
2.25.0.windows.1
|
||||
2.25.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue