Fix riding snow golems not activating

This commit is contained in:
William Blake Galbreath
2019-12-20 22:40:25 -06:00
parent 24d6915c6c
commit 92d6264962

View File

@@ -1,4 +1,4 @@
From f8316e6f0522ead67284c7127eae2137c5788cf4 Mon Sep 17 00:00:00 2001
From 3cc19c29cf49905010c819cf8e04b1bac193b7bd 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
@@ -59,7 +59,7 @@ Subject: [PATCH] Integrate ridables
.../minecraft/server/EntitySkeletonStray.java | 1 +
.../server/EntitySkeletonWither.java | 1 +
.../net/minecraft/server/EntitySlime.java | 4 +-
.../net/minecraft/server/EntitySnowman.java | 3 +
.../net/minecraft/server/EntitySnowman.java | 5 +-
.../net/minecraft/server/EntitySpider.java | 2 +
.../net/minecraft/server/EntitySquid.java | 52 +++++++-
.../server/EntityTameableAnimal.java | 6 +
@@ -83,7 +83,7 @@ Subject: [PATCH] Integrate ridables
.../pathfinder/PathfinderGoalHasRider.java | 20 +++
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
79 files changed, 1268 insertions(+), 119 deletions(-)
79 files changed, 1269 insertions(+), 120 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
@@ -2199,7 +2199,7 @@ index 2efc18df9..71e8e95d2 100644
this.setMot(vec3d.x, (double) this.dp(), vec3d.z);
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 53c5057d2..93d3bccb2 100644
index 53c5057d2..9d9998820 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -13,10 +13,12 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
@@ -2223,6 +2223,15 @@ index 53c5057d2..93d3bccb2 100644
IBlockData iblockdata = Blocks.SNOW.getBlockData();
for (int l = 0; l < 4; ++l) {
@@ -133,7 +136,7 @@ public class EntitySnowman extends EntityGolem implements IRangedEntity {
itemstack.subtract(1);
}
}
- return true;
+ return tryRide(entityhuman, enumhand);
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
index d02db5659..c38ae96f2 100644
--- a/src/main/java/net/minecraft/server/EntitySpider.java