EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 13:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Fixed FakeEntityDamageByEntityEvent not getting fired

Browse Source
This commit is contained in:
TfT_02 2013-08-23 15:09:42 +02:00
parent 23983422e0
commit 59f545d5ce
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -20,6 +20,7 @@ Version 1.4.07-dev
+ Added new McMMOPlayerLevelChangeEvent, fired when a players level changes + Added new McMMOPlayerLevelChangeEvent, fired when a players level changes
+ Added new McMMOPlayerLevelDownEvent, fired when a player loses levels + Added new McMMOPlayerLevelDownEvent, fired when a player loses levels
= Fixed bug which allowed players to bypass fishing's exploit prevention = Fixed bug which allowed players to bypass fishing's exploit prevention
= Fixed bug where FakeEntityDamageByEntityEvent wasn't being fired
= Fixed bug with Skull Splitter not finding the locale string = Fixed bug with Skull Splitter not finding the locale string
= Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters. = Fixed issue where locale strings could cause the scoreboard header to be longer than 16 characters.
= Fixed a bug with Beast Lore when the entity had no owner but was tamed. = Fixed a bug with Beast Lore when the entity had no owner but was tamed.

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

@ -54,16 +54,6 @@ public class Taming {
return damage / shockProofModifier; return damage / shockProofModifier;
} }
/**
* Apply the Sharpened Claws ability.
*
* @param damage The initial damage
* @return Damage with SharpenedClaws bonus damage
*/
public static double sharpenedClaws(double damage) {
return damage + Taming.sharpenedClawsBonusDamage;
}
public static void processHolyHound(Wolf wolf, double damage) { public static void processHolyHound(Wolf wolf, double damage) {
double modifiedHealth = Math.min(wolf.getHealth() + damage, wolf.getMaxHealth()); double modifiedHealth = Math.min(wolf.getHealth() + damage, wolf.getMaxHealth());

18
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -75,18 +75,18 @@ public final class CombatUtils {
} }
if (axesManager.canUseAxeMastery()) { if (axesManager.canUseAxeMastery()) {
event.setDamage(axesManager.axeMasteryCheck(event.getDamage())); dealDamage(target, axesManager.axeMasteryCheck(event.getDamage()), player);
} }
if (axesManager.canCriticalHit(target)) { if (axesManager.canCriticalHit(target)) {
event.setDamage(axesManager.criticalHitCheck(target, event.getDamage())); dealDamage(target, axesManager.criticalHitCheck(target, event.getDamage()), player);
} }
if (axesManager.canImpact(target)) { if (axesManager.canImpact(target)) {
axesManager.impactCheck(target); axesManager.impactCheck(target);
} }
else if (axesManager.canGreaterImpact(target)) { else if (axesManager.canGreaterImpact(target)) {
event.setDamage(axesManager.greaterImpactCheck(target, event.getDamage())); dealDamage(target, axesManager.greaterImpactCheck(target, event.getDamage()), player);
} }
if (axesManager.canUseSkullSplitter(target)) { if (axesManager.canUseSkullSplitter(target)) {
@ -105,11 +105,11 @@ public final class CombatUtils {
} }
if (unarmedManager.canUseIronArm()) { if (unarmedManager.canUseIronArm()) {
event.setDamage(unarmedManager.ironArmCheck(event.getDamage())); dealDamage(target, unarmedManager.ironArmCheck(event.getDamage()), player);
} }
if (unarmedManager.canUseBerserk()) { if (unarmedManager.canUseBerserk()) {
event.setDamage(unarmedManager.berserkDamage(event.getDamage())); dealDamage(target, unarmedManager.berserkDamage(event.getDamage()), player);
} }
if (unarmedManager.canDisarm(target)) { if (unarmedManager.canDisarm(target)) {
@ -128,11 +128,11 @@ public final class CombatUtils {
} }
if (tamingManager.canUseSharpenedClaws()) { if (tamingManager.canUseSharpenedClaws()) {
event.setDamage(Taming.sharpenedClaws(event.getDamage())); dealDamage(target, Taming.sharpenedClawsBonusDamage, master);
} }
if (tamingManager.canUseGore()) { if (tamingManager.canUseGore()) {
event.setDamage(tamingManager.gore(target, event.getDamage())); dealDamage(target, tamingManager.gore(target, event.getDamage()), master);
} }
startGainXp(mcMMOPlayer, target, SkillType.TAMING); startGainXp(mcMMOPlayer, target, SkillType.TAMING);
@ -143,7 +143,7 @@ public final class CombatUtils {
ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager(); ArcheryManager archeryManager = mcMMOPlayer.getArcheryManager();
if (archeryManager.canSkillShot()) { if (archeryManager.canSkillShot()) {
event.setDamage(archeryManager.skillShotCheck(event.getDamage())); dealDamage(target, archeryManager.skillShotCheck(event.getDamage()), player);
} }
if (target instanceof Player && SkillType.UNARMED.getPVPEnabled()) { if (target instanceof Player && SkillType.UNARMED.getPVPEnabled()) {
@ -159,7 +159,7 @@ public final class CombatUtils {
} }
if (archeryManager.canDaze(target)) { if (archeryManager.canDaze(target)) {
event.setDamage(archeryManager.dazeCheck((Player) target, event.getDamage())); dealDamage(target, archeryManager.dazeCheck((Player) target, event.getDamage()), player);
} }
if (!arrow.hasMetadata(mcMMO.infiniteArrowKey) && archeryManager.canTrackArrows()) { if (!arrow.hasMetadata(mcMMO.infiniteArrowKey) && archeryManager.canTrackArrows()) {