Updated Upstream (Paper & Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@4e99466 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8874)

Pufferfish Changes:
pufferfish-gg/Pufferfish@52307ae Updated Upstream (Paper)
This commit is contained in:
granny
2023-03-11 21:20:53 -08:00
parent 9e436f732a
commit 235d5075a1
19 changed files with 104 additions and 95 deletions

View File

@@ -260,10 +260,10 @@ index bb249f7d54fd90d63f609eedf0bbb463f1aa96f1..a38863ebd363f54994753937a10e0410
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d713b34a5c57468530f2a7f8d3838d95fc1b01df..98210502756b828bd48897e241d8e7edc0227c9f 100644
index 59a9ca48a9c4194d4b807652df65a2c2c7e61c3b..53b42a10af51865d45b211a13ab1780604ce43ec 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3026,5 +3026,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3017,5 +3017,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);