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

Rebuild patches

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-23 00:01:24 -05:00
parent 50232df146
commit 6cbcd3a785
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0008-Implement-LivingEntity-safeFallDistance.patch
View File

@@ -1,4 +1,4 @@
From fd56e202b0bda0125e3491b9a71c62ac5ee1fcf9 Mon Sep 17 00:00:00 2001
From f3fb38c74738bbd3be7274aab1a2868e39e72add Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:45 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
@@ -39,7 +39,7 @@ index 8ce2fca80..686bca4f2 100644
if (i > 0) {
this.damageEntity(DamageSource.FALL, (float) i);
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 20e8ae96d..b27a9efcc 100644
index 75d845a75..0cb8c6cbc 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -122,6 +122,7 @@ public abstract class EntityLiving extends Entity {
@@ -73,10 +73,10 @@ index 6404b32b2..f8a8da637 100644
if (i > 0) {
if (f >= 6.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index b85385ba4..640faccfd 100644
index c4aa1945f..98f62d776 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -686,4 +686,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -699,4 +699,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return getHandle().isHandRaised();
}
// Paper end