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

@@ -26,10 +26,10 @@ index 45dc5eeb3794492324bd316719524ea797f7ef6a..bbfb5f8f88e972a770d0ce5373c67ffe
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 54a1385e9e7d612a85e7dc0889c3660a1c45348b..56148154a9e685a1327c93be9057115232113476 100644
index e98b1512de9fa68ced782fdd8455434a213931e6..d1d8f45565b6dcdca73b2cc6fd09917b7d89e08f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2932,5 +2932,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2948,5 +2948,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}