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

Implement LivingEntity safeFallDistance

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-05 13:07:43 -05:00
parent aea4028037
commit 17ece600dc
4 changed files with 202 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
patches/api/0005-Implement-LivingEntity-safeFallDistance.patch Normal file
View File

@@ -0,0 +1,37 @@
From 5b9dd7186e204dd62aa6430c2dc97f639a8d0cb8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 5 May 2019 12:58:19 -0500
Subject: [PATCH] Implement LivingEntity safeFallDistance
---
.../java/org/bukkit/entity/LivingEntity.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 956d6886..a3baaecb 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -649,4 +649,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
boolean isHandRaised();
// Paper end
+
+ // Purpur start
+ /**
+ * Gets the distance (in blocks) this entity can safely fall without taking damage
+ *
+ * @return Safe fall distance
+ */
+ float getSafeFallDistance();
+
+ /**
+ * Set the distance (in blocks) this entity can safely fall without taking damage
+ *
+ * @param safeFallDistance Safe fall distance
+ */
+ void setSafeFallDistance(float safeFallDistance);
+ // Purpur end
}
--
2.20.1

17
patches/api/0005-Integrate-ridables.patch → patches/api/0006-Integrate-ridables.patch
View File

@@ -1,22 +1,21 @@
From 16828d4dec0fbb8ce61a353ec4c952e4937211e8 Mon Sep 17 00:00:00 2001
From e8f6e9aeba7fe0b9bca877c2df79fea8c3ca9472 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Fri, 3 May 2019 06:08:35 -0500
Subject: [PATCH] Integrate ridables
---
.../java/org/bukkit/entity/LivingEntity.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
src/main/java/org/bukkit/entity/LivingEntity.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 956d6886..c10e735e 100644
index a3baaecb..097e82a0 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -649,4 +649,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -664,5 +664,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
boolean isHandRaised();
// Paper end
void setSafeFallDistance(float safeFallDistance);
+
+ // Purpur start
+ /**
+ * Whether or not this entity can be ridden in water
+ *
@@ -30,7 +29,7 @@ index 956d6886..c10e735e 100644
+ * @param canBeRiddenInWater Whether or not this entity can be ridden in water
+ */
+ void setCanBeRiddenInWater(boolean canBeRiddenInWater);
+ // Purpur end
// Purpur end
}
--
2.20.1