Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-30 20:48:19 +01:00
Code Issues Projects Releases Wiki Activity

Allow global multiplier to be a double

Browse Source
This commit is contained in:
Bill Tarbell 2012-08-01 19:32:25 -04:00
parent 394ddd4e51
commit d528f11082
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/commands/general/XprateCommand.java
View File

@ -13,7 +13,7 @@ import com.gmail.nossr50.util.Misc;
public class XprateCommand implements CommandExecutor { public class XprateCommand implements CommandExecutor {
private final mcMMO plugin; private final mcMMO plugin;
private static int oldRate = Config.getInstance().xpGainMultiplier; private static double oldRate = Config.getInstance().xpGainMultiplier;
private static boolean xpEvent = false; private static boolean xpEvent = false;
public XprateCommand (mcMMO plugin) { public XprateCommand (mcMMO plugin) {

4
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -7,7 +7,7 @@ import org.bukkit.configuration.ConfigurationSection;
public class Config extends ConfigLoader { public class Config extends ConfigLoader {
private static Config instance; private static Config instance;
public int xpGainMultiplier = 1; public double xpGainMultiplier = 1;
private Config() { private Config() {
super("config.yml"); super("config.yml");
@ -343,7 +343,7 @@ public class Config extends ConfigLoader {
/* General Settings */ /* General Settings */
public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); } public boolean getExperienceGainsMobspawnersEnabled() { return config.getBoolean("Experience.Gains.Mobspawners.Enabled", false); }
public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); } public boolean getExperienceGainsPlayerVersusPlayerEnabled() { return config.getBoolean("Experience.PVP.Rewards", true); }
public int getExperienceGainsGlobalMultiplier() { return config.getInt("Experience.Gains.Multiplier.Global", 1); } public double getExperienceGainsGlobalMultiplier() { return config.getDouble("Experience.Gains.Multiplier.Global", 1.0); }
/* Combat XP Multipliers */ /* Combat XP Multipliers */
public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); } public double getPlayerVersusPlayerXP() { return config.getDouble("Experience.Gains.Multiplier.PVP", 1.0); }

4
src/main/java/com/gmail/nossr50/datatypes/McMMOPlayer.java
View File

@ -108,7 +108,7 @@ public class McMMOPlayer {
* @param newValue The amount of XP to add * @param newValue The amount of XP to add
*/ */
public void addXPOverrideBonus(SkillType skillType, int xp) { public void addXPOverrideBonus(SkillType skillType, int xp) {
int modifiedXp = xp * Config.getInstance().xpGainMultiplier; int modifiedXp = (int)Math.floor(xp * Config.getInstance().xpGainMultiplier);
addXPOverride(skillType, modifiedXp); addXPOverride(skillType, modifiedXp);
} }
@ -129,7 +129,7 @@ public class McMMOPlayer {
bonusModifier = calculatePartyXPModifier(skillType); bonusModifier = calculatePartyXPModifier(skillType);
} }
int xp = (int) (newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier; int xp = (int)Math.floor((newValue / skillType.getXpModifier()) * Config.getInstance().xpGainMultiplier);
if (bonusModifier > 0) { if (bonusModifier > 0) {
if (bonusModifier >= 2) { if (bonusModifier >= 2) {