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: d0800d0c Update checkstyle e4e4bf70 Remove package-info from tests, breaks some IDEs d6651bb0 No longer necessary to synchronize sync events CraftBukkit Changes: e82b5477 SPIGOT-5556: Some biome methods use incorrect positions 544ccdc5 Update checkstyle 512ff7a5 Print legacy load reason in debug mode df371c1b SPIGOT-5554: Clear error message when BossBar is used for not fully joined players 18168500 Update scriptus 6bbb4e73 Clean up CraftBlockData.toString b1e96bd5 SPIGOT-5551: BlockState.setData fails when used by legacy plugin Spigot Changes: b9baf717 Add space before ocean seed output 13394884 Rebuild patches
This commit is contained in:
parent
7951cfe36a
commit
1eb775c6dc
12 changed files with 65 additions and 105 deletions
|
@ -6,7 +6,7 @@ Subject: [PATCH] Add exception reporting event
|
|||
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
|
||||
new file mode 100644
|
||||
index 00000000..2f573299
|
||||
index 000000000..2f573299a
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/event/server/ServerExceptionEvent.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -55,7 +55,7 @@ index 00000000..2f573299
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
|
||||
new file mode 100644
|
||||
index 00000000..6fb39af0
|
||||
index 000000000..6fb39af04
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerCommandException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -125,7 +125,7 @@ index 00000000..6fb39af0
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
|
||||
new file mode 100644
|
||||
index 00000000..410b2413
|
||||
index 000000000..410b24139
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerEventException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -183,7 +183,7 @@ index 00000000..410b2413
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
|
||||
new file mode 100644
|
||||
index 00000000..c06ea394
|
||||
index 000000000..c06ea3942
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -212,7 +212,7 @@ index 00000000..c06ea394
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
|
||||
new file mode 100644
|
||||
index 00000000..e762ed0d
|
||||
index 000000000..e762ed0db
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerInternalException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -253,7 +253,7 @@ index 00000000..e762ed0d
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
|
||||
new file mode 100644
|
||||
index 00000000..f016ba3b
|
||||
index 000000000..f016ba3b1
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginEnableDisableException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -280,7 +280,7 @@ index 00000000..f016ba3b
|
|||
\ No newline at end of file
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
|
||||
new file mode 100644
|
||||
index 00000000..6defac28
|
||||
index 000000000..6defac287
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -324,7 +324,7 @@ index 00000000..6defac28
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
|
||||
new file mode 100644
|
||||
index 00000000..89e13252
|
||||
index 000000000..89e132525
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerPluginMessageException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -394,7 +394,7 @@ index 00000000..89e13252
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
|
||||
new file mode 100644
|
||||
index 00000000..2d0b2d4a
|
||||
index 000000000..2d0b2d4a9
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerSchedulerException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -437,7 +437,7 @@ index 00000000..2d0b2d4a
|
|||
+}
|
||||
diff --git a/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
|
||||
new file mode 100644
|
||||
index 00000000..5582999f
|
||||
index 000000000..5582999fe
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/com/destroystokyo/paper/exception/ServerTabCompleteException.java
|
||||
@@ -0,0 +0,0 @@
|
||||
|
@ -464,7 +464,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 f020cb04..adfc7aae 100644
|
||||
index f020cb04e..adfc7aae2 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -0,0 +0,0 @@ import java.util.HashMap;
|
||||
|
@ -506,7 +506,7 @@ 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 3c5d8a0e..861d808c 100644
|
||||
index b9ce12ff9..715954c75 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
|
||||
@@ -0,0 +0,0 @@ import java.util.WeakHashMap;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue