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@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
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 6f6386230dcd061760a8386691063601f9a7f1d5..9bb19e7a112c1411bb6b717de983c0359f6b0cb6 100644
index 8f9c23969aec0fb101f5532976b07106878499fe..57960731e7bf6abb8a5db875f71f4de312180574 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -27,7 +27,7 @@ index 6f6386230dcd061760a8386691063601f9a7f1d5..9bb19e7a112c1411bb6b717de983c035
if (!state.isAir()) {
double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
@@ -1966,7 +1967,7 @@ public abstract class LivingEntity extends Entity {
@@ -1988,7 +1989,7 @@ public abstract class LivingEntity extends Entity {
MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
@@ -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 8393e9f64fe52724b260089349fd4e5e87e99a40..20b054d807078015ea795fa2a101c72c3f1c1fbe 100644
index 778c3f9fe4f7cff450e2bb75ae9d8414af772cd4..dca22c93c6743a5f14ba33541a45f34059978b61 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -925,4 +925,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -966,4 +966,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
}
// Paper end