mirror of
https://github.com/PaperMC/Paper.git
synced 2025-08-07 15:42:19 -07:00
Update upstream B/CB/S
--- work/Bukkit Submodule work/Bukkit 1627782b..67e91ef7: > Fix some incorrectly handled JavaDoc > SPIGOT-4478: Update PlayerLoginEvent docs > Add API to manipulate boss bar of entities and those created by commands --- work/CraftBukkit Submodule work/CraftBukkit ca22de36..3a911828: > SPIGOT-4477: Arrows only firing direction of boat > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation > Add API to manipulate boss bar of entities and those created by commands --- work/Spigot Submodule work/Spigot 2474d93d..947a8e7f: > Rebuild patches
This commit is contained in:
@@ -232,7 +232,7 @@ index 00000000..d17061e6
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
||||
index 756d9c34..b80a22b0 100644
|
||||
index cb21a4e4..02e7d118 100644
|
||||
--- a/src/main/java/org/bukkit/Bukkit.java
|
||||
+++ b/src/main/java/org/bukkit/Bukkit.java
|
||||
@@ -0,0 +0,0 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
@@ -284,7 +284,7 @@ index 756d9c34..b80a22b0 100644
|
||||
|
||||
public static Server.Spigot spigot()
|
||||
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
||||
index 4b342052..5ac21b51 100644
|
||||
index 10f56d4f..9e7bc162 100644
|
||||
--- a/src/main/java/org/bukkit/Server.java
|
||||
+++ b/src/main/java/org/bukkit/Server.java
|
||||
@@ -0,0 +0,0 @@ import org.bukkit.generator.ChunkGenerator;
|
||||
|
Reference in New Issue
Block a user