Added EntityTame event. Fixes BUKKIT-1109

2012-03-09 22:25:59 -05:00
parent e625999f24
commit fce3386aa0
2 changed files with 4 additions and 2 deletions
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -115,7 +115,8 @@ public class EntityOcelot extends EntityTameableAnimal {
                }

                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.setCatType(1 + this.world.random.nextInt(3));
                        this.setOwnerName(entityhuman.name);