From cfc51e9b9636cd48c66d04770f24dd1ba6b5f38c Mon Sep 17 00:00:00 2001 From: t00thpick1 Date: Wed, 17 Dec 2014 22:34:42 -0500 Subject: [PATCH] use players for events --- .../java/com/gmail/nossr50/skills/fishing/FishingManager.java | 2 +- .../java/com/gmail/nossr50/skills/swords/SwordsManager.java | 2 +- 2 files changed, 2 insertions(+), 2 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 ccac74894..63ddcb082 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -437,7 +437,7 @@ public class FishingManager extends SkillManager { } Misc.dropItem(target.getLocation(), drop); - CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1)); // Make it so you can shake a mob no more than 4 times. + CombatUtils.dealDamage(target, Math.max(target.getMaxHealth() / 4, 1), getPlayer()); // Make it so you can shake a mob no more than 4 times. applyXpGain(ExperienceConfig.getInstance().getFishingShakeXP(), XPGainReason.PVE); } } diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java index 769028708..ab22670e1 100644 --- a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java +++ b/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java @@ -83,7 +83,7 @@ public class SwordsManager extends SkillManager { } if (SkillUtils.activationSuccessful(SecondaryAbility.COUNTER, getPlayer(), getSkillLevel(), activationChance)) { - CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier); + CombatUtils.dealDamage(attacker, damage / Swords.counterAttackModifier, getPlayer()); getPlayer().sendMessage(LocaleLoader.getString("Swords.Combat.Countered"));