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

@@ -99,10 +99,10 @@ index 331646e5be8c626d75738cb05742d31e909efb8f..6a327616cd590b70170f8441c003a210
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fd8a91c414e31287839579e5afe29e9538173698..abc43910f79a2834a3349997a9077a3f3dcb2f41 100644
index 40fe24de4a7bd49f47bb76ad1a25aa7f3c4cbfd9..3ea9dab2d6ed04d43d5ab7c5dc428434c47dbea1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3144,5 +3144,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3148,5 +3148,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}