From e91800263aa458738b6ee8d0f60ead3aa712b32c Mon Sep 17 00:00:00 2001 From: Mirality Date: Mon, 9 Jun 2025 21:42:14 +1200 Subject: [PATCH 1/2] Take the napalm away from knights --- .../core/entity/ai/workers/guard/KnightCombatAI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/guard/KnightCombatAI.java b/src/main/java/com/minecolonies/core/entity/ai/workers/guard/KnightCombatAI.java index 8cb0739ee49..ba1b2c1d1a3 100644 --- a/src/main/java/com/minecolonies/core/entity/ai/workers/guard/KnightCombatAI.java +++ b/src/main/java/com/minecolonies/core/entity/ai/workers/guard/KnightCombatAI.java @@ -167,7 +167,7 @@ protected void doAttack(final LivingEntity target) final int fireLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FIRE_ASPECT, user.getItemInHand(InteractionHand.MAIN_HAND)); if (fireLevel > 0) { - target.setSecondsOnFire(fireLevel * 80); + target.setSecondsOnFire(fireLevel * 4); } if (user.level.getGameTime() - lastAoeUseTime > KNOCKBACK_COOLDOWN) From 86022a1b231e760acd16619f37a7aac356821bf6 Mon Sep 17 00:00:00 2001 From: Mirality Date: Mon, 9 Jun 2025 22:03:44 +1200 Subject: [PATCH 2/2] Also nerf the rangers --- .../core/entity/ai/workers/guard/RangerCombatAI.java | 2 +- .../minecolonies/core/entity/mobs/aitasks/RaiderRangedAI.java | 2 +- .../java/com/minecolonies/core/items/ItemPharaoScepter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/guard/RangerCombatAI.java b/src/main/java/com/minecolonies/core/entity/ai/workers/guard/RangerCombatAI.java index ccd8aeff70a..8cc33e19048 100644 --- a/src/main/java/com/minecolonies/core/entity/ai/workers/guard/RangerCombatAI.java +++ b/src/main/java/com/minecolonies/core/entity/ai/workers/guard/RangerCombatAI.java @@ -179,7 +179,7 @@ protected void doAttack(final LivingEntity target) if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, bow) > 0) { - arrow.setSecondsOnFire(100); + arrow.setSecondsOnFire(5); } final int k = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.PUNCH_ARROWS, bow); if (k > 0) diff --git a/src/main/java/com/minecolonies/core/entity/mobs/aitasks/RaiderRangedAI.java b/src/main/java/com/minecolonies/core/entity/mobs/aitasks/RaiderRangedAI.java index 3d3e144764b..84c80449feb 100644 --- a/src/main/java/com/minecolonies/core/entity/mobs/aitasks/RaiderRangedAI.java +++ b/src/main/java/com/minecolonies/core/entity/mobs/aitasks/RaiderRangedAI.java @@ -108,7 +108,7 @@ protected void doAttack(final LivingEntity target) if (flightCounter > 5 && arrowEntity instanceof CustomArrowEntity) { ((CustomArrowEntity) arrowEntity).setPlayerArmorPierce(); - arrowEntity.setSecondsOnFire(200); + arrowEntity.setSecondsOnFire(10); arrowEntity.setBaseDamage(10); } diff --git a/src/main/java/com/minecolonies/core/items/ItemPharaoScepter.java b/src/main/java/com/minecolonies/core/items/ItemPharaoScepter.java index fa6d5cbcecc..156167cf501 100755 --- a/src/main/java/com/minecolonies/core/items/ItemPharaoScepter.java +++ b/src/main/java/com/minecolonies/core/items/ItemPharaoScepter.java @@ -94,7 +94,7 @@ public void releaseUsing(@NotNull final ItemStack stack, @NotNull final Level wo if (EnchantmentHelper.getItemEnchantmentLevel(Enchantments.FLAMING_ARROWS, stack) > 0) { - abstractarrowentity.setSecondsOnFire(100); + abstractarrowentity.setSecondsOnFire(5); } stack.hurtAndBreak(1, playerentity, new Consumer() {