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

Make skeleton and zombie horses always tamed for riding

Browse Source
This commit is contained in:
William Blake Galbreath
2019-07-07 19:58:26 -05:00
parent 7dd5471293
commit 8cfd70eae2
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0011-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From 441f9a8e1bf19a33fae42367b81fb2d08f83ba01 Mon Sep 17 00:00:00 2001
From 17561f8c3ae230ab95d83035ad1b647823cc0757 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -28,6 +28,8 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntityGuardian.java | 29 ++++-
.../minecraft/server/EntityGuardianElder.java | 1 +
.../minecraft/server/EntityHorseAbstract.java | 4 +
.../minecraft/server/EntityHorseSkeleton.java | 6 +
.../minecraft/server/EntityHorseZombie.java | 6 +
.../net/minecraft/server/EntityHuman.java | 14 ++-
.../server/EntityIllagerIllusioner.java | 3 +
.../minecraft/server/EntityIllagerWizard.java | 3 +
@@ -134,7 +136,7 @@ Subject: [PATCH] Integrate ridables
.../controller/ControllerMoveWASDWater.java | 42 +++++++
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
130 files changed, 1237 insertions(+), 106 deletions(-)
132 files changed, 1249 insertions(+), 106 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -1478,6 +1480,36 @@ index e08eaddef..6f4e9ed1a 100644
this.K = 1.0F;
this.loadChest();
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
index d28119583..3f5759ca4 100644
--- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
+++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
@@ -179,4 +179,10 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
return true;
}
}
+
+ // Purpur start
+ public boolean isTamed() {
+ return true;
+ }
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
index 5e6ab622d..891370caf 100644
--- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
+++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
@@ -79,4 +79,10 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@Override
protected void ef() {}
+
+ // Purpur start
+ public boolean isTamed() {
+ return true;
+ }
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 61da5d365..8b1f56acc 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java