Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@983377b Correctly check if bucket dispenses will succeed for event (#10109)
PaperMC/Paper@58e120b [ci skip] Remove extraneous diff added in 1.20.3 update (#10101)
PaperMC/Paper@816bacc Call EntityChangeBlockEvent for cake eating (#10105)
PaperMC/Paper@692db0c fix CustomModelData being removed (#10113)
PaperMC/Paper@509876d Keep fully frozen entities fully activated (#10103)
PaperMC/Paper@1fa48d1 include relative flags in PlayerTeleportEvent (#8190)
This commit is contained in:
granny
2024-01-03 12:49:27 -08:00
parent 837307112c
commit 6488438861
8 changed files with 20 additions and 20 deletions

View File

@@ -99,10 +99,10 @@ index 8af705619e8a784c6128d7ff4838eeae56e59821..f6c6cd92e1eff044abefa6ca74477d36
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e7886daefcb5f4890b86b5f6962b40b1bbcb5183..dc2b7450775a2ffadedb07b166410cb42ddacc16 100644
index 9306facdc8aa56674f896fa3ab3d2b54dc5a2f4b..e3c2279c0096976b9b8a574b731fad7bfa6f770f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3419,5 +3419,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3425,5 +3425,43 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}