geforkt von Mirrors/Paper
94 Zeilen
3.9 KiB
Diff
94 Zeilen
3.9 KiB
Diff
--- a/net/minecraft/server/EntityWolf.java
|
|
+++ b/net/minecraft/server/EntityWolf.java
|
|
@@ -4,6 +4,11 @@
|
|
import java.util.UUID;
|
|
import javax.annotation.Nullable;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory;
|
|
+import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
|
|
+// CraftBukkit end
|
|
+
|
|
public class EntityWolf extends EntityTameableAnimal {
|
|
|
|
private static final DataWatcherObject<Float> DATA_HEALTH = DataWatcher.a(EntityWolf.class, DataWatcherRegistry.c);
|
|
@@ -60,6 +65,22 @@
|
|
this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE).setValue(2.0D);
|
|
}
|
|
|
|
+ // CraftBukkit - add overriden version
|
|
+ @Override
|
|
+ public boolean setGoalTarget(EntityLiving entityliving, org.bukkit.event.entity.EntityTargetEvent.TargetReason reason, boolean fire) {
|
|
+ if (!super.setGoalTarget(entityliving, reason, fire)) {
|
|
+ return false;
|
|
+ }
|
|
+ entityliving = getGoalTarget();
|
|
+ if (entityliving == null) {
|
|
+ this.setAngry(false);
|
|
+ } else if (!this.isTamed()) {
|
|
+ this.setAngry(true);
|
|
+ }
|
|
+ return true;
|
|
+ }
|
|
+ // CraftBukkit end
|
|
+
|
|
public void setGoalTarget(@Nullable EntityLiving entityliving) {
|
|
super.setGoalTarget(entityliving);
|
|
if (entityliving == null) {
|
|
@@ -194,9 +215,10 @@
|
|
Entity entity = damagesource.getEntity();
|
|
|
|
if (this.goalSit != null) {
|
|
- this.goalSit.setSitting(false);
|
|
+ // CraftBukkit - moved into EntityLiving.d(DamageSource, float)
|
|
+ // PAIL : checkme
|
|
+ // this.goalSit.setSitting(false);
|
|
}
|
|
-
|
|
if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) {
|
|
f = (f + 1.0F) / 2.0F;
|
|
}
|
|
@@ -237,7 +259,7 @@
|
|
--itemstack.count;
|
|
}
|
|
|
|
- this.heal((float) itemfood.getNutrition(itemstack));
|
|
+ this.heal((float) itemfood.getNutrition(itemstack), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit
|
|
return true;
|
|
}
|
|
} else if (itemstack.getItem() == Items.DYE) {
|
|
@@ -258,7 +280,7 @@
|
|
this.goalSit.setSitting(!this.isSitting());
|
|
this.bd = false;
|
|
this.navigation.o();
|
|
- this.setGoalTarget((EntityLiving) null);
|
|
+ this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
|
|
}
|
|
} else if (itemstack != null && itemstack.getItem() == Items.BONE && !this.isAngry()) {
|
|
if (!entityhuman.abilities.canInstantlyBuild) {
|
|
@@ -266,12 +288,14 @@
|
|
}
|
|
|
|
if (!this.world.isClientSide) {
|
|
- if (this.random.nextInt(3) == 0) {
|
|
+ // CraftBukkit - added event call and isCancelled check.
|
|
+ if (this.random.nextInt(3) == 0 && !CraftEventFactory.callEntityTameEvent(this, entityhuman).isCancelled()) {
|
|
this.setTamed(true);
|
|
this.navigation.o();
|
|
this.setGoalTarget((EntityLiving) null);
|
|
this.goalSit.setSitting(true);
|
|
this.setHealth(20.0F);
|
|
+ this.setHealth(this.getMaxHealth()); // CraftBukkit - 20.0 -> getMaxHealth()
|
|
this.setOwnerUUID(entityhuman.getUniqueID());
|
|
this.o(true);
|
|
this.world.broadcastEntityEffect(this, (byte) 7);
|
|
@@ -353,7 +377,7 @@
|
|
}
|
|
|
|
protected boolean isTypeNotPersistent() {
|
|
- return !this.isTamed() && this.ticksLived > 2400;
|
|
+ return !this.isTamed() /*&& this.ticksLived > 2400*/; // CraftBukkit
|
|
}
|
|
|
|
public boolean a(EntityLiving entityliving, EntityLiving entityliving1) {
|