summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityWolf.java
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-06-17 23:06:20 -0400
committerEvilSeph <evilseph@unaligned.org>2011-06-17 23:06:20 -0400
commit68695fb9d63a52aec8950acb49299e4576dd45ec (patch)
treef8e2cede4ac483fda83f855d315f68cefb52b905 /src/main/java/net/minecraft/server/EntityWolf.java
parentd48e9c22f5ceb9d4d75756c2f4af78f0c9ff9f75 (diff)
downloadcraftbukkit-68695fb9d63a52aec8950acb49299e4576dd45ec.tar
craftbukkit-68695fb9d63a52aec8950acb49299e4576dd45ec.tar.gz
craftbukkit-68695fb9d63a52aec8950acb49299e4576dd45ec.tar.lz
craftbukkit-68695fb9d63a52aec8950acb49299e4576dd45ec.tar.xz
craftbukkit-68695fb9d63a52aec8950acb49299e4576dd45ec.zip
Fixed EntityTame event firing too many times.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityWolf.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityWolf.java16
1 files changed, 5 insertions, 11 deletions
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)));
}
}
}