Work on v0.6

1 files changed, 13 insertions, 8 deletions

diff --git a/src/main/java/net/uomc/mineshaft/SleepCommand.java b/src/main/java/net/uomc/mineshaft/SleepCommand.java
index ef97b8b..389e78b 100644
--- a/src/main/java/net/uomc/mineshaft/SleepCommand.java
+++ b/src/main/java/net/uomc/mineshaft/SleepCommand.java
@@ -4,6 +4,7 @@ import java.awt.Color;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -26,7 +27,7 @@ public class SleepCommand extends CooldownCommand {
     private static final int MAX_ITEMS_DROP = 10;
     private static final int MIN_ITEMS_DROP = 3;
     private static final long MAX_DAMAGE = 30;
-    private static final long MIN_DAMAGE = 20;
+    private static final long MIN_DAMAGE = 19;
 	private Mineshaft bot;
 	private static final String damageEmoji = EmojiParser.parseToUnicode(":fire:");
 
@@ -52,7 +53,7 @@ public class SleepCommand extends CooldownCommand {
             return false;
         }
 
-        if (bot.getPickaxes().isNether(e.getMember())) {
+        if (bot.getPlayerStats().isNether(e.getMember())) {
             long damage = (long) Math.ceil((MAX_DAMAGE-MIN_DAMAGE)*Math.random() + MIN_DAMAGE);
             String actionString = "Your bed exploded! " + PlayerHealths.getHPString(-damage) + "\n";
             EmbedBuilder em = new EmbedBuilder();
@@ -63,24 +64,28 @@ public class SleepCommand extends CooldownCommand {
 
             bot.removeItem(e.getMember(), MineshaftItem.BED, 1);
 
-            e.getChannel().sendMessageEmbeds(em.build()).queue(m -> {
+            e.getMessage().replyEmbeds(em.build()).queue(m -> {
 
                 int itemsDrop = (int) (Math.random() * (MAX_ITEMS_DROP-MIN_ITEMS_DROP) + MIN_ITEMS_DROP);
                 Map<MineshaftItem, Long> award = new LinkedHashMap<>();
                 for (int i = 0; i < itemsDrop; ++i) {
-                    award = bot.sumItems(award,
+                    award.putAll(bot.sumItems(award,
                             bot.getMineCommand().getAwards(null,
                                     bot.getMineCommand().getOre(
-                                           null, true)));
+                                           null, true))));
                 }
 
                 long finalHP = bot.getHealths().damageAndDropIfKill(m, e.getMember(), damage, damageEmoji + " " + e.getMember().getAsMention() + " died to Intentional Game Design", award);
 
                 if (finalHP > 0) {
-                    bot.addItems(e.getMember(), award);
+                    em.appendDescription(bot.createItemList(award, "+%s"));
 
-                    MessageEmbed embed = DropUtil.getDropEmbed(bot, award, em.build());
-                    DropUtil.spawnDropEdit(bot, m, embed, award);
+                    m.editMessageEmbeds(em.build()).queueAfter(2, TimeUnit.SECONDS, m2 -> {
+                        bot.addItems(e.getMember(), award);
+                    });
+
+                    //MessageEmbed embed = DropUtil.getDropEmbed(bot, award, em.build());
+                    //DropUtil.spawnDropEdit(bot, m, embed, award);
                 }
             });