Zombie minion nerf

Elite-Modding-Team · Oct 1, 2024 · 3e909f6 · 3e909f6
1 parent b510476
commit 3e909f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/main/java/twilightforest/entity/EntityTFLoyalZombie.java b/src/main/java/twilightforest/entity/EntityTFLoyalZombie.java
@@ -23,7 +23,6 @@
 import net.minecraft.entity.passive.EntityAnimal;
 import net.minecraft.entity.passive.EntityTameable;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.MobEffects;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.SoundEvent;
@@ -64,17 +63,6 @@ protected void applyEntityAttributes() {
 		this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(3.0D);
 	}
 
-	@Override
-	public boolean attackEntityAsMob(Entity entity) {
-		boolean success = entity.attackEntityFrom(DamageSource.causeMobDamage(this), 7);
-
-		if (success) {
-			entity.motionY += 0.2;
-		}
-
-		return success;
-	}
-
 	/*@Override
 	public void onLivingUpdate() {
 		// once our damage boost effect wears out, start to burn
@@ -106,7 +94,7 @@ public boolean shouldAttackEntity(EntityLivingBase target, EntityLivingBase owne
 
 	@Override
 	protected boolean canDespawn() {
-		return !this.isTamed();
+		return true;
 	}
 
 	@Override

diff --git a/src/main/java/twilightforest/item/scepter/ItemTFScepterTwilight.java b/src/main/java/twilightforest/item/scepter/ItemTFScepterTwilight.java
@@ -35,7 +35,7 @@ public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player
 		if (stack.getItemDamage() == stack.getMaxDamage()) {
 			return ActionResult.newResult(EnumActionResult.FAIL, player.getHeldItem(hand));
 		} else {
-			player.playSound(SoundEvents.ENTITY_ENDEREYE_DEATH, 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F);
+			player.playSound(SoundEvents.ENTITY_ENDEREYE_LAUNCH, 1.0F, (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F + 1.0F);
 			player.swingArm(hand);
 
 			if (!world.isRemote) {

diff --git a/src/main/java/twilightforest/item/scepter/ItemTFScepterZombie.java b/src/main/java/twilightforest/item/scepter/ItemTFScepterZombie.java
@@ -52,14 +52,13 @@ public ActionResult<ItemStack> onItemRightClick(@Nonnull World world, EntityPlay
                 zombie.setPositionAndRotation(ray.hitVec.x, ray.hitVec.y, ray.hitVec.z, 1.0F, 1.0F);
                 zombie.setTamed(true);
                 zombie.setOwnerId(player.getUniqueID());
-                zombie.addPotionEffect(new PotionEffect(MobEffects.STRENGTH, 1200, 1));
                 world.spawnEntity(zombie);
 
                 stack.damageItem(1, player);
             }
 
             if (!player.isCreative())
-                player.getCooldownTracker().setCooldown(this, 100);
+                player.getCooldownTracker().setCooldown(this, 200);
         }
 
         return ActionResult.newResult(EnumActionResult.SUCCESS, stack);