Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b9b4c9a Deprecate duplicate API for arrow stuck count (#8829)
PaperMC/Paper@57f1157 Updated Upstream (Bukkit/CraftBukkit) (#8823)
This commit is contained in:
granny
2023-02-08 20:24:09 -08:00
parent 5c6a830298
commit cbb7fc002e
23 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0015-LivingEntity-safeFallDistance.patch
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 60d8052390a3a6fde05fb19896f8b8047f2c9178..38352df039574b7fec428ab910e484a7f267bfbe 100644
index 82a8fddc5a0ee82c8ce78c02f4ecb106b89c734d..b528a65b8b03d795b703b839fc695249a12642a7 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 e1b873404c5f58ea678b12a762f98fb62a1c4ab7..dd12931ac3b3cbb27a6ead1f8399631fb8be1780 100644
index 4439b42c97bef076efa8ec99da382414d3c522dc..97775b773a70431071bf3599d6556ab82f1f3a1f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1054,4 +1054,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1060,4 +1060,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().knockback(strength, directionX, directionZ);
};
// Paper end