mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-22 10:57:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@173bd93c [ci/skip] Rebuild patches PaperMC/Paper@a47cb98c Add check for null player name in Team methods (#13468) PaperMC/Paper@ebf50865 Expand wateranimal-spawn-height config for nautilus (#13488) PaperMC/Paper@179626d5 Fix a few inverted checks for skulls (#13502) PaperMC/Paper@5fa4be93 feature: expose mannequin poses (#13429) PaperMC/Paper@1fd9d085 Fix backward compat for World#setPVP (#13503) PaperMC/Paper@350fd5e3 Prevent negative anger level for neutral mobs (#13504) PaperMC/Paper@575df562 Add zip error reporting to PaperPluginClassLoader (#13505) PaperMC/Paper@51239f4b Fix usage message on spigot reload command (#13494) PaperMC/Paper@ede8d0df Format paper-api mob goals in debug renderer (#13495) PaperMC/Paper@444a2ba1 Change thrown trident item to use copy of ItemStack of count 1 (#13394) PaperMC/Paper@93e81bfc Add support for loading plugins from extra directories (#13447)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -1942,6 +_,52 @@
|
||||
@@ -1939,6 +_,52 @@
|
||||
return (this.getHandle().getDragonFight() == null) ? null : new CraftDragonBattle(this.getHandle().getDragonFight());
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
|
||||
@@ -162,6 +_,14 @@
|
||||
@@ -169,6 +_,14 @@
|
||||
.defaultsTo(new File[] {})
|
||||
.describedAs("Jar file");
|
||||
.describedAs("Plugin directory");
|
||||
|
||||
+ // Purpur start - Purpur config files
|
||||
+ this.acceptsAll(asList("purpur", "purpur-settings"), "File for purpur settings")
|
||||
|
||||
Reference in New Issue
Block a user