Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added EntityTame event. Fixes BUKKIT-1109

Browse Source
This commit is contained in:
EvilSeph 2012-03-09 22:25:59 -05:00
parent e625999f24
commit fce3386aa0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/net/minecraft/server/EntityOcelot.java
View File

@ -115,7 +115,8 @@ public class EntityOcelot extends EntityTameableAnimal {
} }
if (!this.world.isStatic) { if (!this.world.isStatic) {
if (this.random.nextInt(3) == 0) { // CraftBukkit - added event call and isCancelled check.
if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
this.setTamed(true); this.setTamed(true);
this.setCatType(1 + this.world.random.nextInt(3)); this.setCatType(1 + this.world.random.nextInt(3));
this.setOwnerName(entityhuman.name); this.setOwnerName(entityhuman.name);

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

@ -186,7 +186,8 @@ public class EntityWolf extends EntityTameableAnimal {
} }
if (!this.world.isStatic) { if (!this.world.isStatic) {
if (this.random.nextInt(3) == 0) { // CraftBukkit - added event call and isCancelled check.
if (this.random.nextInt(3) == 0 && !org.bukkit.craftbukkit.event.CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
this.setTamed(true); this.setTamed(true);
this.setPathEntity((PathEntity) null); this.setPathEntity((PathEntity) null);
this.b((EntityLiving) null); this.b((EntityLiving) null);