Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d714682 Add more entity api (#7564)
PaperMC/Paper@1790528 More projectile API (#5731)
PaperMC/Paper@ea1efef Remove Patches (#7541)
This commit is contained in:
BillyGalbreath
2022-03-11 15:53:15 -06:00
parent f9756e3b9c
commit 67f934ef19
11 changed files with 28 additions and 28 deletions

View File

@@ -26,10 +26,10 @@ index 99e75679acfe2c9d8583590008c14aad8d73d203..001317b9c196390dac8fe16d2aadf7e1
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 20b42ea8b055ad37417ca73dbd616e1ace761c45..95bdd555f13f4d75b93d77cd11080e7b9f9ef028 100644
index 2cf93ddb6a061fb4361f72a2df629d90f1bf27d1..ef501f2af9056ccecb861f4c916dedc08c1faafb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2765,5 +2765,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2754,5 +2754,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}