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

Make endermites ridable

Browse Source
This commit is contained in:
William Blake Galbreath
2019-05-04 06:09:14 -05:00
parent 80522c9794
commit 02967f8760
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 6dd27fbce0f0f793d7c2727bbdd9acc8d1bdc52d Mon Sep 17 00:00:00 2001
From 1ba8a1d170a7a0d53b9c7ba04e50d775ee123b8e 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
@@ -10,6 +10,7 @@ Subject: [PATCH] Integrate ridables
.../java/net/minecraft/server/EntityCow.java | 14 ++++
.../net/minecraft/server/EntityCreeper.java | 14 ++++
.../net/minecraft/server/EntityEnderman.java | 15 ++++
.../net/minecraft/server/EntityEndermite.java | 15 ++++
.../net/minecraft/server/EntityHorse.java | 10 ++-
.../minecraft/server/EntityHorseAbstract.java | 4 +-
.../server/EntityHorseChestedAbstract.java | 18 +++--
@@ -35,7 +36,7 @@ Subject: [PATCH] Integrate ridables
.../purpur/controller/ControllerLookWASD.java | 44 +++++++++++
.../purpur/controller/ControllerMoveWASD.java | 77 +++++++++++++++++++
.../craftbukkit/entity/CraftLivingEntity.java | 12 +++
31 files changed, 507 insertions(+), 28 deletions(-)
32 files changed, 522 insertions(+), 28 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
@@ -235,6 +236,37 @@ index 94504044..7ac728ba 100644
public void setCarried(@Nullable IBlockData iblockdata) {
this.datawatcher.set(EntityEnderman.c, Optional.ofNullable(iblockdata));
}
diff --git a/src/main/java/net/minecraft/server/EntityEndermite.java b/src/main/java/net/minecraft/server/EntityEndermite.java
index 9a22e202..8e8d4cbc 100644
--- a/src/main/java/net/minecraft/server/EntityEndermite.java
+++ b/src/main/java/net/minecraft/server/EntityEndermite.java
@@ -11,6 +11,11 @@ public class EntityEndermite extends EntityMonster {
super(EntityTypes.ENDERMITE, world);
this.b_ = 3;
this.setSize(0.4F, 0.3F);
+ // Purpur start
+ this.moveController = new net.pl3x.purpur.controller.ControllerMoveWASD(this);
+ this.lookController = new net.pl3x.purpur.controller.ControllerLookWASD(this);
+ this.canBeRiddenInWater = true;
+ // Purpur end
}
protected void n() {
@@ -128,4 +133,14 @@ public class EntityEndermite extends EntityMonster {
public EnumMonsterType getMonsterType() {
return EnumMonsterType.ARTHROPOD;
}
+
+ // Purpur start - processInteract
+ @Override
+ public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
+ if (super.a(entityhuman, enumhand)) {
+ return true; // vanilla action handled
+ }
+ return tryRide(entityhuman, enumhand);
+ }
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
index 1b9425f3..ff7f1a61 100644
--- a/src/main/java/net/minecraft/server/EntityHorse.java