Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
This commit is contained in:
BillyGalbreath
2022-02-18 20:06:35 -06:00
parent d0ea018612
commit 5ad7f4bd90
36 changed files with 101 additions and 99 deletions

View File

@@ -121,10 +121,10 @@ index 0c7afc7787bf9303a8f8a7b4125a3bc45b70ccff..cb4af460cae665016e0a6ec7ff664830
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 db25979960774c59c4bd1d864cc8203f54305d3c..2bdc1caa5748cf947f3941b4388e9f81e4c42ce2 100644
index 5fc7354df359c77eecac4873f00abf9b14d73f40..b0459c6b416ad4aec90b4fa44c894f7c592690ca 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2719,5 +2719,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2740,5 +2740,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}