From 3c209a9884389184134c6c3bb31d5ab8c8842831 Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Fri, 20 Dec 2013 17:14:36 -0500 Subject: [PATCH] [Bleeding] Fix crash involving horse passengers. Fixes BUKKIT-5212 Setting a horse's passenger to a non-living entity will cause a server crash when the horse ticks, we need to check that it is a living entity before casting, and skip otherwise. --- src/main/java/net/minecraft/server/EntityHorse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java index 2477237502..d9f2f3ec67 100644 --- a/src/main/java/net/minecraft/server/EntityHorse.java +++ b/src/main/java/net/minecraft/server/EntityHorse.java @@ -881,7 +881,7 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener { } public void e(float f, float f1) { - if (this.passenger != null && this.cs()) { + if (this.passenger != null && this.passenger instanceof EntityLiving && this.cs()) { // CraftBukkit - Check type of passenger this.lastYaw = this.yaw = this.passenger.yaw; this.pitch = this.passenger.pitch * 0.5F; this.b(this.yaw, this.pitch);