114 Zeilen
5.1 KiB
Diff
114 Zeilen
5.1 KiB
Diff
--- a/net/minecraft/server/EntityWolf.java
|
|
+++ b/net/minecraft/server/EntityWolf.java
|
|
@@ -4,6 +4,11 @@
|
|
import java.util.function.Predicate;
|
|
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<Boolean> bA = DataWatcher.a(EntityWolf.class, DataWatcherRegistry.i);
|
|
@@ -41,7 +46,7 @@
|
|
this.goalSelector.a(10, new PathfinderGoalRandomLookaround(this));
|
|
this.targetSelector.a(1, new PathfinderGoalOwnerHurtByTarget(this));
|
|
this.targetSelector.a(2, new PathfinderGoalOwnerHurtTarget(this));
|
|
- this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a());
|
|
+ this.targetSelector.a(3, (new PathfinderGoalHurtByTarget(this, new Class[0])).a(new Class[0])); // CraftBukkit - decompile error
|
|
this.targetSelector.a(4, new PathfinderGoalRandomTargetNonTamed<>(this, EntityAnimal.class, false, EntityWolf.bz));
|
|
this.targetSelector.a(4, new PathfinderGoalRandomTargetNonTamed<>(this, EntityTurtle.class, false, EntityTurtle.bw));
|
|
this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntitySkeletonAbstract.class, false));
|
|
@@ -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
|
|
+
|
|
@Override
|
|
public void setGoalTarget(@Nullable EntityLiving entityliving) {
|
|
super.setGoalTarget(entityliving);
|
|
@@ -94,6 +115,11 @@
|
|
public void a(NBTTagCompound nbttagcompound) {
|
|
super.a(nbttagcompound);
|
|
this.setAngry(nbttagcompound.getBoolean("Angry"));
|
|
+ // CraftBukkit start - moved from below, SPIGOT-4893
|
|
+ if (this.getGoalTarget() == null && this.isAngry()) {
|
|
+ this.setAngry(false);
|
|
+ }
|
|
+ // CraftBukkit end
|
|
if (nbttagcompound.hasKeyOfType("CollarColor", 99)) {
|
|
this.setCollarColor(EnumColor.fromColorIndex(nbttagcompound.getInt("CollarColor")));
|
|
}
|
|
@@ -130,7 +156,7 @@
|
|
this.world.broadcastEntityEffect(this, (byte) 8);
|
|
}
|
|
|
|
- if (!this.world.isClientSide && this.getGoalTarget() == null && this.isAngry()) {
|
|
+ if (false && !this.world.isClientSide && this.getGoalTarget() == null && this.isAngry()) { // CraftBukkit - SPIGOT-4893
|
|
this.setAngry(false);
|
|
}
|
|
|
|
@@ -210,7 +236,8 @@
|
|
Entity entity = damagesource.getEntity();
|
|
|
|
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)) {
|
|
@@ -237,7 +264,7 @@
|
|
super.setTamed(flag);
|
|
if (flag) {
|
|
this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(20.0D);
|
|
- this.setHealth(20.0F);
|
|
+ this.setHealth(this.getMaxHealth()); // CraftBukkit - 20.0 -> getMaxHealth()
|
|
} else {
|
|
this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(8.0D);
|
|
}
|
|
@@ -261,7 +288,7 @@
|
|
itemstack.subtract(1);
|
|
}
|
|
|
|
- this.heal((float) item.getFoodInfo().getNutrition());
|
|
+ this.heal((float) item.getFoodInfo().getNutrition(), org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.EATING); // CraftBukkit
|
|
return true;
|
|
}
|
|
|
|
@@ -290,14 +317,15 @@
|
|
this.goalSit.setSitting(!this.isSitting());
|
|
this.jumping = false;
|
|
this.navigation.o();
|
|
- this.setGoalTarget((EntityLiving) null);
|
|
+ this.setGoalTarget((EntityLiving) null, TargetReason.FORGOT_TARGET, true); // CraftBukkit - reason
|
|
}
|
|
} else if (item == Items.BONE && !this.isAngry()) {
|
|
if (!entityhuman.abilities.canInstantlyBuild) {
|
|
itemstack.subtract(1);
|
|
}
|
|
|
|
- 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.tame(entityhuman);
|
|
this.navigation.o();
|
|
this.setGoalTarget((EntityLiving) null);
|