From 68695fb9d63a52aec8950acb49299e4576dd45ec Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@unaligned.org>
Date: Fri, 17 Jun 2011 23:06:20 -0400
Subject: Fixed EntityTame event firing too many times.

---
 src/main/java/net/minecraft/server/EntityWolf.java | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'src/main/java/net/minecraft/server/EntityWolf.java')

diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index 2ca4e040..e759e43b 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java
+++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -419,18 +419,12 @@ public class EntityWolf extends EntityAnimal {
     }
 
     public void d(boolean flag) {
-        // CraftBukkit start
-       EntityTameEvent event = CraftEventFactory.callEntityTameEvent(this, null);
-
-        if (!event.isCancelled()) {
-        // CraftBukkit end
-            byte b0 = this.datawatcher.a(16);
+        byte b0 = this.datawatcher.a(16);
 
-            if (flag) {
-                this.datawatcher.b(16, Byte.valueOf((byte) (b0 | 4)));
-            } else {
-                this.datawatcher.b(16, Byte.valueOf((byte) (b0 & -5)));
-            }
+        if (flag) {
+            this.datawatcher.b(16, Byte.valueOf((byte) (b0 | 4)));
+        } else {
+            this.datawatcher.b(16, Byte.valueOf((byte) (b0 & -5)));
         }
     }
 }
-- 
cgit v1.2.3