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

3in1: Update Upstream, Remove useless patches, Fix cramming/colliding bug

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-29 20:53:47 -05:00
parent 75774b7422
commit 9db1fe9d28
75 changed files with 421 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patches/api/0005-Integrate-ridables.patch Normal file
View File

@@ -0,0 +1,62 @@
From ec82ba52f74b2cd9cb328e4ee9424b30f2e5c018 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 | 14 ++++++++++++++
src/main/java/org/bukkit/entity/Mob.java | 16 ++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index f47a6869f..3a8961853 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -696,5 +696,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);
+
+ /**
+ * Whether or not this entity can be ridden in water
+ *
+ * @return Whether or not this entity can be ridden in water
+ */
+ boolean canBeRiddenInWater();
+
+ /**
+ * Set whether or not this entity can be ridden in water
+ *
+ * @param canBeRiddenInWater Whether or not this entity can be ridden in water
+ */
+ void setCanBeRiddenInWater(boolean canBeRiddenInWater);
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index 784db447d..b3a9c1a45 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -42,4 +42,20 @@ public interface Mob extends LivingEntity, Lootable {
*/
@Nullable
public LivingEntity getTarget();
+
+ // Purpur start
+ /**
+ * Get if this mob is ridable
+ *
+ * @return True if ridable
+ */
+ boolean isRidable();
+
+ /**
+ * Set if this mob is ridable
+ *
+ * @param ridable True to make ridable
+ */
+ void setRidable(boolean ridable);
+ // Purpur end
}
--
2.20.1