Fix Benimatic#62

Author: williewillus

src/main/java/twilightforest/entity/ai/EntityAITFThrowRider.java

@@ -1,7 +1,7 @@
 package twilightforest.entity.ai;
 
+import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.ai.EntityAIBase;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.math.Vec3d;
@@ -10,24 +10,19 @@
 import twilightforest.network.PacketThrowPlayer;
 
 public class EntityAITFThrowRider extends EntityAIBase {
-
-	
-    private EntityCreature theEntityCreature;
+    private final EntityCreature theEntityCreature;
 	private int throwTimer;
 
-    
 	public EntityAITFThrowRider(EntityCreature par1EntityCreature, float par2)
     {
         this.theEntityCreature = par1EntityCreature;
         this.setMutexBits(1);
     }
-    /**
-     * Returns whether the EntityAIBase should begin execution.
-     */
+
     @Override
 	public boolean shouldExecute()
     {
-        if (this.theEntityCreature.getRidingEntity() == null || this.theEntityCreature.getRNG().nextInt(5) > 0)
+        if (this.theEntityCreature.getPassengers().isEmpty() || this.theEntityCreature.getRNG().nextInt(5) > 0)
         {
             return false;
         }
@@ -37,23 +32,17 @@ public boolean shouldExecute()
         }
     }
 
-    /**
-     * Execute a one shot task or start executing a continuous task
-     */
     @Override
 	public void startExecuting()
     {
-    	EntityLivingBase rider = (EntityLivingBase) this.theEntityCreature.getRidingEntity();
-        rider.dismountEntity(theEntityCreature);
+    	Entity rider = this.theEntityCreature.getPassengers().get(0);
+        rider.dismountRidingEntity();
 
         Vec3d throwVec = this.theEntityCreature.getLookVec().scale(2);
-
-        // let's throw the player a fixed value in the air
         throwVec = new Vec3d(throwVec.xCoord, 0.9, throwVec.zCoord);
 
         rider.addVelocity(throwVec.xCoord, throwVec.yCoord, throwVec.zCoord);
 
-        // if we're throwing a player (probably!), send a packet with the velocity
         if (rider instanceof EntityPlayerMP) {
         	EntityPlayerMP player = (EntityPlayerMP)rider;
 
@@ -64,13 +53,10 @@ public void startExecuting()
         this.throwTimer = 0;
     }
 
-    /**
-     * Returns whether an in-progress EntityAIBase should continue executing
-     */
     @Override
 	public boolean shouldContinueExecuting()
     {
-    	if (this.theEntityCreature.getRidingEntity() == null) {
+    	if (this.theEntityCreature.getPassengers().isEmpty()) {
     		this.throwTimer++;
     	}