Add potency modifier support for forest of thorns

This commit is contained in:
Electroblob77
2020-06-19 21:03:35 +01:00
parent 9936388600
commit 3a5a97c6b9
3 changed files with 10 additions and 4 deletions
@@ -126,11 +126,14 @@ public class BlockThorns extends BlockBush implements ITileEntityProvider {
private static boolean applyThornDamage(World world, BlockPos pos, IBlockState state, Entity target){
DamageSource source = DamageSource.CACTUS;
float damage = Spells.forest_of_thorns.getProperty(Spell.DAMAGE).floatValue();
TileEntity tileentity = world.getTileEntity(state.getValue(HALF) == EnumBlockHalf.UPPER ? pos.down() : pos);
if(tileentity instanceof TileEntityThorns){
damage *= ((TileEntityThorns)tileentity).damageMultiplier;
EntityLivingBase caster = ((TileEntityThorns)tileentity).getCaster();
if(!AllyDesignationSystem.isValidTarget(caster, target)) return false; // Don't attack or slow allies of the caster
@@ -141,7 +144,6 @@ public class BlockThorns extends BlockBush implements ITileEntityProvider {
}
if(target.ticksExisted % 20 == 0){
float damage = Spells.forest_of_thorns.getProperty(Spell.DAMAGE).floatValue();
EntityUtils.attackEntityWithoutKnockback(target, source, damage);
}