Merge branch 'development'

This commit is contained in:
Brianna 2020-04-21 06:31:38 -04:00
commit 589e9b9e93
3 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicHoppers</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>4.6</version>
<version>4.6.1</version>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>EpicHoppers-${project.version}</finalName>

View File

@ -272,7 +272,7 @@ public class EpicHoppers extends SongodaPlugin {
int linkAmount = levels.getInt("Link-amount", 1);
boolean filter = levels.getBoolean("Filter");
boolean teleport = levels.getBoolean("Teleport");
int costExperiance = levels.getInt("Cost-xp", -1);
int costExperience = levels.getInt("Cost-xp", -1);
int costEconomy = levels.getInt("Cost-eco", -1);
int autoSell = levels.getInt("AutoSell");
@ -290,7 +290,7 @@ public class EpicHoppers extends SongodaPlugin {
}
}
levelManager.addLevel(level, costExperiance, costEconomy, radius, amount, filter, teleport, linkAmount, modules);
levelManager.addLevel(level, costExperience, costEconomy, radius, amount, filter, teleport, linkAmount, modules);
}
}

View File

@ -88,7 +88,7 @@ public class ModuleAutoSell extends Module {
value = Settings.AUTOSELL_PRICES.getStringList().stream().filter(line -> Material.valueOf(line.split(",")[0]) == itemStack.getType()).findFirst()
.map(s -> Double.valueOf(s.split(",")[1])).orElse(0.0);
if (value == 0) continue;
if (value <= 0) continue;
double sellingFor = value * itemStack.getAmount();