Upstream/EpicFurnaces
1
0
Fork 0
mirror of https://github.com/songoda/EpicFurnaces.git synced 2025-02-26 08:21:20 +01:00
Code Issues Projects Releases Wiki Activity

Fixed issue with leveling up based on use not working.

Browse Source
This commit is contained in:
Brianna 2019-06-25 21:08:28 -04:00
parent 93acc9bd2c
commit 73635df738
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/songoda/epicfurnaces/furnace/Furnace.java
View File

@ -7,6 +7,7 @@ import com.songoda.epicfurnaces.gui.GUIOverview;
import com.songoda.epicfurnaces.utils.CostType; import com.songoda.epicfurnaces.utils.CostType;
import com.songoda.epicfurnaces.utils.Methods; import com.songoda.epicfurnaces.utils.Methods;
import com.songoda.epicfurnaces.utils.ServerVersion; import com.songoda.epicfurnaces.utils.ServerVersion;
import com.songoda.epicfurnaces.utils.settings.Setting;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
@ -65,7 +66,7 @@ public class Furnace {
this.uses++; this.uses++;
this.tolevel++; this.tolevel++;
int multi = plugin.getConfig().getInt("Main.Level Cost Multiplier"); int multi = Setting.LEVEL_MULTIPLIER.getInt();
if (level.getReward() == null) return; if (level.getReward() == null) return;
@ -85,9 +86,9 @@ public class Furnace {
int needed = ((multi * level.getLevel()) - tolevel) - 1; int needed = ((multi * level.getLevel()) - tolevel) - 1;
if (plugin.getConfig().getBoolean("Main.Upgrade By Smelting Materials") if (Setting.UPGRADE_BY_SMELTING.getBoolean()
&& needed <= 0 && needed <= 0
&& plugin.getConfig().contains("settings.levels.Level-" + (level.getLevel() + 1))) { && plugin.getLevelManager().getLevel(level.getLevel() + 1) != null) {
tolevel = 0; tolevel = 0;
level = plugin.getLevelManager().getLevel(this.level.getLevel() + 1); level = plugin.getLevelManager().getLevel(this.level.getLevel() + 1);
} }
@ -100,7 +101,7 @@ public class Furnace {
double rand = Math.random() * 100; double rand = Math.random() * 100;
if (rand >= num if (rand >= num
|| e.getResult().equals(Material.SPONGE) || e.getResult().equals(Material.SPONGE)
|| plugin.getConfig().getBoolean("Main.No Rewards From Custom Recipes") || Setting.NO_REWARDS_FROM_RECIPES.getBoolean()
&& plugin.getFurnaceRecipeFile().getConfig().contains("Recipes." + i.getSmelting().getType().toString())) { && plugin.getFurnaceRecipeFile().getConfig().contains("Recipes." + i.getSmelting().getType().toString())) {
return; return;
} }