Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3aec863 Add BlockLockCheckEvent (#7840)
PaperMC/Paper@0262de0 Deprecate TargetBlock/EntityInfo and assocated methods (#7381)
PaperMC/Paper@28c7d40 Add Sneaking API for Entities (#8485)
PaperMC/Paper@262c08f Updated Upstream (CraftBukkit) (#8680)
This commit is contained in:
BillyGalbreath
2022-12-16 10:40:50 -06:00
parent ed3d48efcf
commit 7062a32f8f
28 changed files with 65 additions and 65 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index a24bffefc209ebfe31e553ceef212615edeb2687..2dacb572e2164ccd381c4e3cbc39d9238a89f500 100644
index 60d8052390a3a6fde05fb19896f8b8047f2c9178..38352df039574b7fec428ab910e484a7f267bfbe 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -256,6 +256,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,10 +62,10 @@ index 8b1942b396606f0c989645a6ac587fbdd26a3dc5..c1c5e884f00398032196ee71b55b348f
// Purpur start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index e3c1a7f7e643b8a2f42e76c92087219f984ea8aa..810e13a060a7c64f8d0d08a632b378ef8480710e 100644
index e1b873404c5f58ea678b12a762f98fb62a1c4ab7..dd12931ac3b3cbb27a6ead1f8399631fb8be1780 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1043,4 +1043,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1054,4 +1054,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().knockback(strength, directionX, directionZ);
};
// Paper end