Merge remote-tracking branch 'origin/master'

Author: RedVortexDev

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/NbsCommand.java

@@ -68,10 +68,9 @@ public void run(CommandEvent event) {
                 byte[] b64 = new NBSToTemplate(NBSDecoder.parse(file)).convert();
                 File templateOutputfile = File.createTempFile("nbs_output", ".txt");
                 BufferedWriter writer = new BufferedWriter(new FileWriter(templateOutputfile));
-                writer.write(String.format("/give @p minecraft:ender_chest{display:{Name:'[{\"text\":\"» \",\"color\":\"gold\"},{\"text\":\"Code Template\",\"color\":\"yellow\",\"bold\":true}]'},PublicBukkitValues:{\"hypercube:codetemplatedata\":'{\"name\":\"&6» &e&lCode Template\",\"version\":1,\"code\":\"%s\",\"author\":\"helpbot\"}'}} 1", new String(b64)));
+                writer.write(String.format("/give @p minecraft:ender_chest[minecraft:item_name=[{text:\"» \",color:gold},{text:\"Code Template\",color:yellow,bold:1}],custom_data={PublicBukkitValues:{\"hypercube:codetemplatedata\":'{\"name\":\"&6» &e&lCode Template\",\"version\":1,\"code\":\"%s\",\"author\":\"Help Bot\"}'}}]", new String(b64)));
 
                 writer.close();
-                
 
                 EmbedBuilder embed = new EmbedBuilder()
                         .setColor(new Color(70,199,82))

src/main/java/com/diamondfire/helpbot/bot/command/impl/stats/plot/AbstractPlotCommand.java

@@ -7,6 +7,7 @@
 import com.diamondfire.helpbot.util.*;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.utils.FileUpload;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.sql.*;
@@ -50,9 +51,12 @@ public void run(CommandEvent event) {
                     new InformativeReply(InformativeReplyType.INFO, String.format("Plot Information (%s)", plotID), null)
             );
 
+            @Nullable String handle = resultTablePlot.getString("handle");
+            @Nullable String description = resultTablePlot.getString("description");
             PlotSize size = PlotSize.fromID(resultTablePlot.getInt("plotsize") - 1);
 
-            embed.setTitle(String.format("Plot Information (%s)", plotID));
+            embed.setTitle(handle == null ? String.format("Plot Information (%s)", plotID) : String.format("Plot Information (%s) (%s)", handle, plotID));
+            embed.setDescription(description);
             embed.addField("Name", StringUtil.fromMiniMessage(resultTablePlot.getString("name")), true);
             embed.addField("Owner", resultTablePlot.getString("owner_name"), true);
             embed.addField("Node", "Node " + resultTablePlot.getInt("node"), true);
@@ -110,7 +114,8 @@ public void run(CommandEvent event) {
     private enum PlotSize {
         BASIC(51),
         LARGE(101),
-        MASSIVE(301);
+        MASSIVE(301),
+        MEGA(1001);
 
         private final int size;