Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

Initial commit (Forge 1291).

Browse Source
This commit is contained in:
gamerforEA
2015-03-22 20:38:04 +03:00
commit 16773ead6a
611 changed files with 64826 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
patches/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java.patch Normal file
View File

@ -0,0 +1,35 @@
--- ../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);
}