From 69e90a89f7319e3b0302159b2c70b7abb1ef82be Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 16 Nov 2024 15:24:48 -0800 Subject: [PATCH] minor refactoring --- .../skills/fishing/FishingManager.java | 3 +- .../nossr50/util/skills/CombatUtils.java | 61 ++++++------------- 2 files changed, 21 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index 3ca634ec6..12c193cef 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -555,7 +555,8 @@ public class FishingManager extends SkillManager { } ItemUtils.spawnItem(getPlayer(), target.getLocation(), drop, ItemSpawnReason.FISHING_SHAKE_TREASURE); - CombatUtils.dealDamage(target, Math.min(Math.max(target.getMaxHealth() / 4, 1), 10), EntityDamageEvent.DamageCause.CUSTOM, getPlayer()); // Make it so you can shake a mob no more than 4 times. + // Make it so you can shake a mob no more than 4 times. + CombatUtils.dealDamage(target, Math.min(Math.max(target.getMaxHealth() / 4, 1), 10), getPlayer()); applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP(), XPGainReason.PVE); } } diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index b48fcf5ec..4b4e8f996 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java @@ -509,7 +509,6 @@ public final class CombatUtils { if (mcMMO.p.getSkillTools().doesPlayerHaveSkillPermission(player, PrimarySkillType.SWORDS)) { processSwordCombat(target, player, event); - } } else if (ItemUtils.isAxe(heldItem)) { if (!mcMMO.p.getSkillTools().canCombatSkillsTrigger(PrimarySkillType.AXES, target)) { @@ -698,46 +697,17 @@ public final class CombatUtils { * @param damage Amount of damage to attempt to do */ public static void dealDamage(@NotNull LivingEntity target, double damage) { - dealDamage(target, damage, DamageCause.CUSTOM, null); + dealDamage(target, damage, null); } /** * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker * - * @param target LivingEntity which to attempt to damage + * @param target the entity to attempt to damage * @param damage Amount of damage to attempt to do - * @param attacker Player to pass to event as damager + * @param attacker the responsible entity (nullable) */ - @Deprecated - public static void dealDamage(@NotNull LivingEntity target, double damage, @NotNull LivingEntity attacker) { - dealDamage(target, damage, DamageCause.CUSTOM, attacker); - } - -// /** -// * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker -// * -// * @param target LivingEntity which to attempt to damage -// * @param damage Amount of damage to attempt to do -// * @param attacker Player to pass to event as damager -// */ -// public static void dealDamage(LivingEntity target, double damage, Map modifiers, LivingEntity attacker) { -// if (target.isDead()) { -// return; -// } -// -// // Aren't we applying the damage twice???? -// target.damage(getFakeDamageFinalResult(attacker, target, damage, modifiers)); -// } - - /** - * Attempt to damage target for value dmg with reason ENTITY_ATTACK with damager attacker - * - * @param target LivingEntity which to attempt to damage - * @param damage Amount of damage to attempt to do - * @param attacker Player to pass to event as damager - */ - @Deprecated - public static void dealDamage(@NotNull LivingEntity target, double damage, @NotNull DamageCause cause, @Nullable Entity attacker) { + public static void dealDamage(@NotNull LivingEntity target, double damage, @Nullable Entity attacker) { if (target.isDead()) { return; } @@ -807,12 +777,13 @@ public final class CombatUtils { /** * Apply Area-of-Effect ability actions. - * @param attacker The attacking player + * @param attacker The attacking player * @param target The defending entity * @param damage The initial damage amount * @param type The type of skill being used */ - public static void applyAbilityAoE(@NotNull Player attacker, @NotNull LivingEntity target, double damage, @NotNull PrimarySkillType type) { + public static void applyAbilityAoE(@NotNull Player attacker, @NotNull LivingEntity target, + double damage, @NotNull PrimarySkillType type) { int numberOfTargets = getTier(attacker.getInventory().getItemInMainHand()); // The higher the weapon tier, the more targets you hit double damageAmount = Math.max(damage, 1); @@ -821,7 +792,8 @@ public final class CombatUtils { break; } - if ((ExperienceConfig.getInstance().isNPCInteractionPrevented() && Misc.isNPCEntityExcludingVillagers(entity)) + if ((ExperienceConfig.getInstance().isNPCInteractionPrevented() + && Misc.isNPCEntityExcludingVillagers(entity)) || !(entity instanceof LivingEntity livingEntity) || !shouldBeAffected(attacker, entity)) { continue; } @@ -831,7 +803,8 @@ public final class CombatUtils { switch (type) { case SWORDS: if (entity instanceof Player) { - NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, "Swords.Combat.SS.Struck"); + NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, + "Swords.Combat.SS.Struck"); } final McMMOPlayer mmoAttacker = UserManager.getPlayer(attacker); @@ -844,9 +817,9 @@ public final class CombatUtils { case AXES: if (entity instanceof Player) { - NotificationManager.sendPlayerInformation((Player)entity, NotificationType.SUBSKILL_MESSAGE, "Axes.Combat.SS.Struck"); + NotificationManager.sendPlayerInformation((Player) entity, NotificationType.SUBSKILL_MESSAGE, + "Axes.Combat.SS.Struck"); } - break; default: @@ -963,7 +936,9 @@ public final class CombatUtils { } if (mcMMO.p.getPartyConfig().isPartyEnabled()) { - if ((mcMMO.p.getPartyManager().inSameParty(player, defender) || mcMMO.p.getPartyManager().areAllies(player, defender)) && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) { + if ((mcMMO.p.getPartyManager().inSameParty(player, defender) + || mcMMO.p.getPartyManager().areAllies(player, defender)) + && !(Permissions.friendlyFire(player) && Permissions.friendlyFire(defender))) { return false; } } @@ -1015,7 +990,9 @@ public final class CombatUtils { if (tamer instanceof Player owner) { - return (owner == attacker || (mcMMO.p.getPartyConfig().isPartyEnabled() && (mcMMO.p.getPartyManager().inSameParty(attacker, owner) || mcMMO.p.getPartyManager().areAllies(attacker, owner)))); + return (owner == attacker || (mcMMO.p.getPartyConfig().isPartyEnabled() + && (mcMMO.p.getPartyManager().inSameParty(attacker, owner) + || mcMMO.p.getPartyManager().areAllies(attacker, owner)))); } }