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

@@ -31,7 +31,7 @@ index 08ccf4b33313f3bc7ddc51b385288765f3cd3a88..66cf04d6035b1676d75ae46b73782461
// Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index daa464b0098339cdc52483ffd4f7474176487dd0..ebb6d9d2cc977e4c473bb3839c8bb03ca40ca4bb 100644
index 6a42eeb81b30a9fb99e4f100228612298cdc246c..489e08778451cb52efefb341cda74129be3728c6 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -266,6 +266,7 @@ public abstract class LivingEntity extends Entity {
@@ -351,7 +351,7 @@ index d0c2167c82da8b2e9e3222c4ebb50ef2e141b34f..d6093557894789eb20f79b83547620b4
// Paper end
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 09b997701f7ebd2d3a8abe90dcf933c0037a95e0..f5f30763a8d497aa02c9e02938e49a644fcf2754 100644
index 39ae7bdac23601c567013799375bf32b96d4e1fd..62ef6f620608f9b1147f525f5cc1540f72b8d4b1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -206,6 +206,11 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -367,10 +367,10 @@ index 09b997701f7ebd2d3a8abe90dcf933c0037a95e0..f5f30763a8d497aa02c9e02938e49a64
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index bea0a1441b3f331e1bbaee15a91b279950bca640..32d4960fbee976004d5d1a3a5c29c2e963a8d577 100644
index 082510cfd3c371a55c19e633db4184fc9c5ee309..a0605955b7f3a24372dfa2c0ea6e94c47f5921eb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1060,5 +1060,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1071,5 +1071,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}