You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
35 lines
1.7 KiB
35 lines
1.7 KiB
--- ../src-base/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java |
|
+++ ../src-work/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java |
|
@@ -64,7 +64,8 @@ |
|
int i = this.horseHost.getTemper(); |
|
int j = this.horseHost.getMaxTemper(); |
|
|
|
- if (j > 0 && this.horseHost.getRNG().nextInt(j) < i) |
|
+ // CraftBukkit |
|
+ if (j > 0 && this.horseHost.getRNG().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.horseHost, (EntityPlayer) this.horseHost.riddenByEntity).isCancelled() && this.horseHost.riddenByEntity instanceof EntityPlayer) |
|
{ |
|
this.horseHost.setTamedBy((EntityPlayer)this.horseHost.riddenByEntity); |
|
this.horseHost.worldObj.setEntityState(this.horseHost, (byte)7); |
|
@@ -74,8 +75,20 @@ |
|
this.horseHost.increaseTemper(5); |
|
} |
|
|
|
- this.horseHost.riddenByEntity.mountEntity((Entity)null); |
|
- this.horseHost.riddenByEntity = null; |
|
+ // CraftBukkit start - Handle dismounting to account for VehicleExitEvent being fired. |
|
+ if (this.horseHost.riddenByEntity != null) |
|
+ { |
|
+ this.horseHost.riddenByEntity.mountEntity((Entity) null); |
|
+ |
|
+ // If the entity still has a passenger, then a plugin cancelled the event. |
|
+ if (this.horseHost.riddenByEntity != null) |
|
+ { |
|
+ return; |
|
+ } |
|
+ } |
|
+ |
|
+ // this.entity.passenger = null; |
|
+ // CraftBukkit end |
|
this.horseHost.makeHorseRearWithSound(); |
|
this.horseHost.worldObj.setEntityState(this.horseHost, (byte)6); |
|
}
|
|
|