EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-01 05:04:43 +02:00
Code Issues Projects Releases Wiki Activity

Fix issues with double damage, double death messages, and other damage oddities.

Browse Source 
Fixes #1450
This commit is contained in:
GJ
2013-09-12 11:52:34 -04:00
parent 44626c36a9
commit 58c7dcb705
5 changed files with 73 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -109,9 +109,9 @@ public class TamingManager extends SkillManager {
* @param damage The initial damage
* @param wolf The wolf using the ability
*/
public void gore(LivingEntity target, double damage, Wolf wolf) {
public double gore(LivingEntity target, double damage, Wolf wolf) {
if (!SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Taming.goreMaxChance, Taming.goreMaxBonusLevel)) {
return;
return 0;
}
BleedTimerTask.add(target, Taming.goreBleedTicks);
@ -123,11 +123,11 @@ public class TamingManager extends SkillManager {
getPlayer().sendMessage(LocaleLoader.getString("Combat.Gore"));
damage = (damage * Taming.goreModifier) - damage;
CombatUtils.dealDamage(target, damage, wolf, mcMMOPlayer, SkillType.TAMING);
return CombatUtils.callFakeDamageEvent(wolf, target, damage);
}
public void sharpenedClaws(LivingEntity target, Wolf wolf) {
CombatUtils.dealDamage(target, Taming.sharpenedClawsBonusDamage, wolf, mcMMOPlayer, SkillType.TAMING);
public double sharpenedClaws(LivingEntity target, Wolf wolf) {
return CombatUtils.callFakeDamageEvent(wolf, target, Taming.sharpenedClawsBonusDamage);
}
/**