Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8a08b86 Custom Chat Completions API (#8212)
PaperMC/Paper@6ecdbc0 Use Worldheight for Activation Ranges (#8061)
PaperMC/Paper@532dc51 Add missing BlockFadeEvents (#8171)
This commit is contained in:
BillyGalbreath
2022-07-30 18:41:23 -05:00
parent 513f3bbedf
commit 23fe5b17f7
17 changed files with 42 additions and 42 deletions

View File

@@ -121,10 +121,10 @@ index 3c9d72dd1a1bade79e4c8b5e6c7b136f906ba77d..02707189e0cafcb8db31413566f20784
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 1a4da06d45c88219ec0149f94876931f6c699dc9..27e203e45531c053d78149c6e9f782d58e9f5d44 100644
index fd5906dd18a4ff377c6e2dd180008124faa9600d..0655abd90e7fc34518153b320f5674bd4ebe8f5d 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2907,5 +2907,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2923,5 +2923,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}