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

Health and damage are now doubles, not ints.

Browse Source
This commit is contained in:
GJ
2013-07-11 12:43:36 -04:00
parent 4dc9c97978
commit d07b67b5bf
17 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ public class Taming {
return pet.isTamed() && owner instanceof Player && pet instanceof Wolf;
}
public static int processThickFur(Wolf wolf, int damage) {
public static double processThickFur(Wolf wolf, double damage) {
wolf.playEffect(EntityEffect.WOLF_SHAKE);
return damage / thickFurModifier;
}
@ -49,7 +49,7 @@ public class Taming {
wolf.setFireTicks(0);
}
public static int processShockProof(Wolf wolf, int damage) {
public static double processShockProof(Wolf wolf, double damage) {
wolf.playEffect(EntityEffect.WOLF_SHAKE);
return damage / shockProofModifier;
}
@ -59,12 +59,12 @@ public class Taming {
*
* @param event The event to modify
*/
public static int sharpenedClaws(int damage) {
public static double sharpenedClaws(double damage) {
return damage + Taming.sharpenedClawsBonusDamage;
}
public static void processHolyHound(Wolf wolf, int damage) {
int modifiedHealth = Math.min(wolf.getHealth() + damage, wolf.getMaxHealth());
public static void processHolyHound(Wolf wolf, double damage) {
double modifiedHealth = Math.min(wolf.getHealth() + damage, wolf.getMaxHealth());
wolf.setHealth(modifiedHealth);
wolf.playEffect(EntityEffect.WOLF_HEARTS);

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

@ -84,14 +84,14 @@ public class TamingManager extends SkillManager {
* @param wolf The wolf using the ability
* @param damage The damage being absorbed by the wolf
*/
public void fastFoodService(Wolf wolf, int damage) {
public void fastFoodService(Wolf wolf, double damage) {
if (Taming.fastFoodServiceActivationChance > Misc.getRandom().nextInt(getActivationChance())) {
int health = wolf.getHealth();
int maxHealth = wolf.getMaxHealth();
double health = wolf.getHealth();
double maxHealth = wolf.getMaxHealth();
if (health < maxHealth) {
int newHealth = health + damage;
double newHealth = health + damage;
wolf.setHealth(Math.min(newHealth, maxHealth));
}
}
@ -102,7 +102,7 @@ public class TamingManager extends SkillManager {
*
* @param event The event to modify
*/
public int gore(LivingEntity target, int damage) {
public double gore(LivingEntity target, double damage) {
if (SkillUtils.activationSuccessful(getSkillLevel(), getActivationChance(), Taming.goreMaxChance, Taming.goreMaxBonusLevel)) {
BleedTimerTask.add(target, Taming.goreBleedTicks);
@ -150,7 +150,7 @@ public class TamingManager extends SkillManager {
player.sendMessage(message);
}
public void processEnvironmentallyAware(Wolf wolf, int damage) {
public void processEnvironmentallyAware(Wolf wolf, double damage) {
if (damage > wolf.getHealth()) {
return;
}