blob: 2d4f3e99bc4101c85b41907da70fdf112c7c09e1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- a/net/minecraft/server/PathfinderGoalTame.java
+++ b/net/minecraft/server/PathfinderGoalTame.java
@@ -45,7 +45,8 @@
int i = this.entity.getTemper();
int j = this.entity.getMaxDomestication();
- if (j > 0 && this.entity.bc().nextInt(j) < i) {
+ // CraftBukkit - fire EntityTameEvent
+ if (j > 0 && this.entity.bc().nextInt(j) < i && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this.entity, (EntityHuman) this.entity.passenger).isCancelled() && this.entity.passenger instanceof EntityHuman) {
this.entity.h((EntityHuman) this.entity.passenger);
this.entity.world.broadcastEntityEffect(this.entity, (byte) 7);
return;
@@ -54,8 +55,16 @@
this.entity.u(5);
}
- this.entity.passenger.mount((Entity) null);
- this.entity.passenger = null;
+ // CraftBukkit start - Handle dismounting to account for VehicleExitEvent being fired.
+ if (this.entity.passenger != null) {
+ this.entity.passenger.mount((Entity) null);
+ // If the entity still has a passenger, then a plugin cancelled the event.
+ if (this.entity.passenger != null) {
+ return;
+ }
+ }
+ // this.entity.passenger = null;
+ // CraftBukkit end
this.entity.cW();
this.entity.world.broadcastEntityEffect(this.entity, (byte) 6);
}
|
