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

@@ -121,10 +121,10 @@ index a2af387c671f344d1b302e5aceab0be42c80756f..6ad2ccf91a384bf431e3716d374f0eb4
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b1b3852fd65a6de0ebf55d121d34a63b8fffacbc..ee935e3a3379f059031ded780ea59f2f8915c843 100644
index a95b245ca2fa333085b0fc47f2cc5c5e96dcd075..d017e5a7f509659cdd11c10d76030f34f0c87319 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2740,5 +2740,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2729,5 +2729,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}