Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-28 13:36:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed the fix of the EntityTame event.

Browse Source
This commit is contained in:
EvilSeph 2011-06-23 19:26:36 -04:00
parent a5dd42adb9
commit 0b92a51ba7
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/net/minecraft/server/EntityWolf.java
View File

@ -374,23 +374,18 @@ public class EntityWolf extends EntityAnimal {
} }
if (!this.world.isStatic) { if (!this.world.isStatic) {
// CraftBukkit start // CraftBukkit - added event call and isCancelled check.
if (this.random.nextInt(3) == 0) { if (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
EntityTameEvent event = CraftEventFactory.callEntityTameEvent(this, entityhuman); this.d(true);
this.a((PathEntity) null);
if (!event.isCancelled()) { this.setSitting(true);
// CraftBukkit end this.health = 20;
this.d(true); this.a(entityhuman.name);
this.a((PathEntity) null); this.a(true);
this.setSitting(true); this.world.a(this, (byte) 7);
this.health = 20; } else {
this.a(entityhuman.name); this.a(false);
this.a(true); this.world.a(this, (byte) 6);
this.world.a(this, (byte) 7);
} else {
this.a(false);
this.world.a(this, (byte) 6);
}
} }
} }