Paper/nms-patches/EntityWolf.patch

84 lines
3.5 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/EntityWolf.java
+++ b/net/minecraft/server/EntityWolf.java
2016-05-10 13:47:39 +02:00
@@ -4,6 +4,11 @@
2016-02-29 22:32:46 +01:00
import java.util.UUID;
2016-05-10 13:47:39 +02:00
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 {
2016-02-29 22:32:46 +01:00
private static final DataWatcherObject<Float> DATA_HEALTH = DataWatcher.a(EntityWolf.class, DataWatcherRegistry.c);
2016-11-17 02:41:03 +01:00
@@ -62,6 +67,22 @@
2016-02-29 22:32:46 +01:00
this.getAttributeMap().b(GenericAttributes.ATTACK_DAMAGE).setValue(2.0D);
2015-02-26 23:41:06 +01:00
}
+ // 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;
2015-02-26 23:41:06 +01:00
+ }
+ // CraftBukkit end
2015-02-26 23:41:06 +01:00
+
2016-05-10 13:47:39 +02:00
public void setGoalTarget(@Nullable EntityLiving entityliving) {
2016-02-29 22:32:46 +01:00
super.setGoalTarget(entityliving);
if (entityliving == null) {
@@ -200,9 +221,9 @@
Entity entity = damagesource.getEntity();
2016-02-29 22:32:46 +01:00
if (this.goalSit != null) {
- this.goalSit.setSitting(false);
+ // CraftBukkit - moved into EntityLiving.d(DamageSource, float)
+ // this.goalSit.setSitting(false);
}
-
if (entity != null && !(entity instanceof EntityHuman) && !(entity instanceof EntityArrow)) {
f = (f + 1.0F) / 2.0F;
}
@@ -245,7 +266,7 @@
2016-11-17 02:41:03 +01:00
itemstack.subtract(1);
}
- this.heal((float) itemfood.getNutrition(itemstack));
+ this.heal((float) itemfood.getNutrition(itemstack), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit
2016-02-29 22:32:46 +01:00
return true;
}
} else if (itemstack.getItem() == Items.DYE) {
@@ -266,7 +287,7 @@
2016-02-29 22:32:46 +01:00
this.goalSit.setSitting(!this.isSitting());
2016-11-17 02:41:03 +01:00
this.bd = false;
2017-05-14 04:00:00 +02:00
this.navigation.p();
- this.setGoalTarget((EntityLiving) null);
+ this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
}
2016-11-17 02:41:03 +01:00
} else if (itemstack.getItem() == Items.BONE && !this.isAngry()) {
if (!entityhuman.abilities.canInstantlyBuild) {
@@ -274,12 +295,13 @@
}
2015-02-26 23:41:06 +01:00
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()) {
2017-05-14 04:00:00 +02:00
this.c(entityhuman);
this.navigation.p();
2016-02-29 22:32:46 +01:00
this.setGoalTarget((EntityLiving) null);
this.goalSit.setSitting(true);
2017-05-14 04:00:00 +02:00
- this.setHealth(20.0F);
+ this.setHealth(this.getMaxHealth()); // CraftBukkit - 20.0 -> getMaxHealth()
2016-06-09 03:43:49 +02:00
this.p(true);
this.world.broadcastEntityEffect(this, (byte) 7);
2017-05-14 04:00:00 +02:00
} else {