Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@7a1863e Limit setBurnTime to valid short values (#9623)
PaperMC/Paper@b8a0049 Fix exact choice recipe book clicks (#7822)
PaperMC/Paper@b45ecc9 [ci skip] clear out test plugin
PaperMC/Paper@0c8882f Add OfflinePlayer#isConnected (#9642)
This commit is contained in:
granny
2023-08-24 12:27:22 -07:00
parent 1f42e8f31c
commit 8ef1580b1f
13 changed files with 57 additions and 31 deletions

View File

@@ -121,10 +121,10 @@ index 42801a26b9d5f8af2d0ce1fef864bb031cfa8965..2cac536ebbc21a23a2219c630fe477bf
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 ec2d2a63c9534ae9c3275822906da3564290c262..9fb883b77c65ecc967d7f04c3adbd2e6b4465e55 100644
index d0986b7b130f790c21d2324d0014d258bc36c527..c6ede1fac5c68f2912a9c401765bd10b09afe7f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3286,5 +3286,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3293,5 +3293,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}