Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-add raiders bane damage bonus #10627

Merged
merged 1 commit into from
Feb 2, 2025
+14 −10
Merged

Re-add raiders bane damage bonus #10627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityMinecoloniesMonster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@
import net.minecraft.nbt.CompoundTag;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.damagesource.DamageTypes;
import net.minecraft.world.entity.*;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.monster.Enemy;
Expand All @@ -32,7 +33,7 @@

import static com.minecolonies.api.entity.citizen.AbstractEntityCitizen.ENTITY_AI_TICKRATE;
import static com.minecolonies.api.entity.mobs.RaiderMobUtils.MOB_ATTACK_DAMAGE;
import static com.minecolonies.api.util.constant.NbtTagConstants.*;
import static com.minecolonies.api.util.constant.NbtTagConstants.TAG_SPAWN_POS;
import static com.minecolonies.api.util.constant.RaiderConstants.*;

/**
Expand Down Expand Up @@ -287,11 +288,6 @@ public boolean hurt(@NotNull final DamageSource damageSource, final float damage
threatTable.addThreat(attacker, (int) damage);
}

if (damageSource.typeHolder().is(DamageTypes.FELL_OUT_OF_WORLD))
{
return super.hurt(damageSource, damage);
}

return super.hurt(damageSource, damage);
}

Expand Down
12 changes: 10 additions & 2 deletions src/main/java/com/minecolonies/api/entity/mobs/AbstractEntityMinecoloniesRaider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,24 @@
import com.minecolonies.api.colony.IColonyManager;
import com.minecolonies.api.colony.colonyEvents.IColonyCampFireRaidEvent;
import com.minecolonies.api.colony.colonyEvents.IColonyEvent;
import com.minecolonies.api.enchants.ModEnchants;
import com.minecolonies.api.entity.ai.combat.threat.IThreatTableEntity;
import com.minecolonies.api.entity.pathfinding.registry.IPathNavigateRegistry;
import com.minecolonies.api.items.IChiefSwordItem;
import com.minecolonies.api.util.ColonyUtils;
import com.minecolonies.api.util.DamageSourceKeys;
import com.minecolonies.core.entity.pathfinding.navigation.AbstractAdvancedPathNavigate;
import com.minecolonies.core.entity.pathfinding.navigation.PathingStuckHandler;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.*;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobSpawnType;
import net.minecraft.world.entity.SpawnGroupData;
import net.minecraft.world.entity.monster.Enemy;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.ChunkPos;
Expand Down Expand Up @@ -454,10 +459,13 @@ else if (!level().isClientSide())
source.hurt(level().damageSources().thorns(this), damage * 0.5f);
}

final float raiderDamageEnchantLevel =
player.getMainHandItem().getEnchantmentLevel(player.level().registryAccess().registry(Registries.ENCHANTMENT).get().getHolder(ModEnchants.raiderDamage).get());

// Up to 7 damage are converted to health scaling damage, 7 is the damage of a diamond sword
float baseScalingDamage = Math.min(damage, MAX_SCALED_DAMAGE);
float totalWithScaled =
Math.max(damage, (damage - baseScalingDamage) + baseScalingDamage * HP_PERCENT_PER_DMG * this.getMaxHealth());
Math.max(damage, (damage - baseScalingDamage) + baseScalingDamage * HP_PERCENT_PER_DMG * this.getMaxHealth() * (1 + (raiderDamageEnchantLevel / 5)));
return super.hurt(damageSource, totalWithScaled);
}
}
Expand Down