summaryrefslogtreecommitdiff
path: root/src/main/java/net/uomc/mineshaft/MineCommand.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/uomc/mineshaft/MineCommand.java')
-rw-r--r--src/main/java/net/uomc/mineshaft/MineCommand.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/net/uomc/mineshaft/MineCommand.java b/src/main/java/net/uomc/mineshaft/MineCommand.java
index 730ae85..03207e3 100644
--- a/src/main/java/net/uomc/mineshaft/MineCommand.java
+++ b/src/main/java/net/uomc/mineshaft/MineCommand.java
@@ -138,7 +138,7 @@ public class MineCommand extends CooldownCommand {
}
public MineshaftItem getOre(Member m, boolean nether) {
- int pickaxe = bot.getPickaxes().getPickaxeLevel(m);
+ int pickaxe = m == null ? Pickaxes.MAX_PICKAXE_LEVEL : bot.getPickaxes().getPickaxeLevel(m);
double random = Math.random();
int maxOre = levelToMaxOre(pickaxe);
@@ -146,7 +146,7 @@ public class MineCommand extends CooldownCommand {
List<String> list = oresList;
if(nether) list = netherOresList;
- double c = getEfficiencyCurve(m);
+ double c = m == null ? 2 : getEfficiencyCurve(m);
int i = (int) Math.floor(Math.pow(random, c) * maxOre);
String oreName = list.get(i);
MineshaftItem ore = MineshaftItem.valueOf(oreName.toUpperCase());
@@ -325,6 +325,10 @@ public class MineCommand extends CooldownCommand {
default:
break;
}
+
+ if (member == null)
+ return award;
+
return bot.multiply(award, getPickaxeFortuneCurve(member));
}