From a363e22b2804d896b8c5b38e76005a5998592eb3 Mon Sep 17 00:00:00 2001 From: Sollace Date: Tue, 12 Mar 2019 22:41:13 +0200 Subject: [PATCH] Cuccoons won't take damage when punched by a changeling. --- .../unicopia/entity/EntityCuccoon.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java index 5f0839de..9354c324 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java @@ -14,14 +14,17 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityXPOrb; import net.minecraft.init.Blocks; +import net.minecraft.init.SoundEvents; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHandSide; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.SoundEvent; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -57,6 +60,27 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni getDataManager().set(STRUGGLE_COUNT, count % 6); } + @Override + @Nullable + protected SoundEvent getHurtSound(DamageSource source) { + return SoundEvents.ENTITY_SLIME_SQUISH; + } + + @Override + protected SoundEvent getFallSound(int heightIn) { + return SoundEvents.ENTITY_SLIME_SQUISH; + } + + @Override + public boolean attackEntityFrom(DamageSource source, float amount) { + + if (Predicates.BUGGY.test(source.getTrueSource())) { + amount = 0; + } + + return super.attackEntityFrom(source, amount); + } + @Override protected boolean canBeRidden(Entity entity) { return super.canBeRidden(entity)