EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-31 19:45:26 +02:00
Code Issues Projects Releases Wiki Activity

Taming Cleanup + Compiler Error fix

Browse Source
This commit is contained in:
nossr50
2019-04-03 21:07:12 -07:00
parent 0ca0140348
commit 5b2720a04f
11 changed files with 96 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java
View File

@@ -33,7 +33,7 @@ public class AcrobaticsManager extends SkillManager {
public boolean canGainRollXP()
{
if(!ExperienceConfig.getInstance().isAcrobaticsExploitingPrevented())
if(!mcMMO.getConfigManager().getConfigExploitPrevention().getConfigSectionExploitAcrobatics().isPreventAcrobaticsAbuse())
return true;
if(System.currentTimeMillis() >= rollXPCooldown)

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

@@ -1,47 +1,91 @@
package com.gmail.nossr50.skills.taming;
import com.gmail.nossr50.config.AdvancedConfig;
import org.bukkit.EntityEffect;
import org.bukkit.entity.*;
public class Taming {
public static double fastFoodServiceActivationChance = AdvancedConfig.getInstance().getFastFoodChance();
public static int goreBleedTicks = 2; //Equivalent to rank 1 in Rupture
public static double goreModifier = AdvancedConfig.getInstance().getGoreModifier();
private static Taming instance;
private double fastFoodServiceActivationChance;
private int goreBleedTicks;
private double goreModifier;
private double sharpenedClawsBonusDamage;
private double shockProofModifier;
private double thickFurModifier;
public static double sharpenedClawsBonusDamage = AdvancedConfig.getInstance().getSharpenedClawsBonus();
public Taming() {
fastFoodServiceActivationChance = AdvancedConfig.getInstance().getFastFoodChance();
public static double shockProofModifier = AdvancedConfig.getInstance().getShockProofModifier();
//Equivalent to rank 1 in Rupture
goreBleedTicks = 2;
goreModifier = AdvancedConfig.getInstance().getGoreModifier();
public static double thickFurModifier = AdvancedConfig.getInstance().getThickFurModifier();
sharpenedClawsBonusDamage = AdvancedConfig.getInstance().getSharpenedClawsBonus();
public static boolean canPreventDamage(Tameable pet, AnimalTamer owner) {
shockProofModifier = AdvancedConfig.getInstance().getShockProofModifier();
thickFurModifier = AdvancedConfig.getInstance().getThickFurModifier();
}
public static Taming getInstance() {
if (instance == null)
instance = new Taming();
return instance;
}
public double getFastFoodServiceActivationChance() {
return fastFoodServiceActivationChance;
}
public int getGoreBleedTicks() {
return goreBleedTicks;
}
public double getGoreModifier() {
return goreModifier;
}
public double getSharpenedClawsBonusDamage() {
return sharpenedClawsBonusDamage;
}
public double getShockProofModifier() {
return shockProofModifier;
}
public double getThickFurModifier() {
return thickFurModifier;
}
public boolean canPreventDamage(Tameable pet, AnimalTamer owner) {
return pet.isTamed() && owner instanceof Player && pet instanceof Wolf;
}
public static double processThickFur(Wolf wolf, double damage) {
public double processThickFur(Wolf wolf, double damage) {
wolf.playEffect(EntityEffect.WOLF_SHAKE);
return damage / thickFurModifier;
}
public static void processThickFurFire(Wolf wolf) {
public void processThickFurFire(Wolf wolf) {
wolf.playEffect(EntityEffect.WOLF_SMOKE);
wolf.setFireTicks(0);
}
public static double processShockProof(Wolf wolf, double damage) {
public double processShockProof(Wolf wolf, double damage) {
wolf.playEffect(EntityEffect.WOLF_SHAKE);
return damage / shockProofModifier;
}
public static void processHolyHound(Wolf wolf, double damage) {
public void processHolyHound(Wolf wolf, double damage) {
double modifiedHealth = Math.min(wolf.getHealth() + damage, wolf.getMaxHealth());
wolf.setHealth(modifiedHealth);
wolf.playEffect(EntityEffect.WOLF_HEARTS);
}
protected static String getCallOfTheWildFailureMessage(EntityType type) {
public String getCallOfTheWildFailureMessage(EntityType type) {
switch (type) {
case OCELOT:
return "Taming.Summon.Fail.Ocelot";

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

@@ -124,7 +124,7 @@ public class TamingManager extends SkillManager {
return 0;
}
BleedTimerTask.add(target, getPlayer(), Taming.goreBleedTicks, 1, 2);
BleedTimerTask.add(target, getPlayer(), Taming.getInstance().getGoreBleedTicks(), 1, 2);
if (target instanceof Player) {
NotificationManager.sendPlayerInformation((Player)target, NotificationType.SUBSKILL_MESSAGE, "Combat.StruckByGore");
@@ -132,12 +132,12 @@ public class TamingManager extends SkillManager {
NotificationManager.sendPlayerInformation(getPlayer(), NotificationType.SUBSKILL_MESSAGE, "Combat.Gore");
damage = (damage * Taming.goreModifier) - damage;
damage = (damage * Taming.getInstance().getGoreModifier()) - damage;
return damage;
}
public double sharpenedClaws() {
return Taming.sharpenedClawsBonusDamage;
public double getSharpenedClawsDamage() {
return Taming.getInstance().getSharpenedClawsBonusDamage();
}
/**
@@ -352,7 +352,7 @@ public class TamingManager extends SkillManager {
for (Entity entity : player.getNearbyEntities(range, range, range)) {
if (entity.getType() == type) {
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, Taming.getCallOfTheWildFailureMessage(type));
NotificationManager.sendPlayerInformation(player, NotificationType.SUBSKILL_MESSAGE_FAILED, Taming.getInstance().getCallOfTheWildFailureMessage(type));
return false;
}
}