Merge remote-tracking branch 'DiscordBungee/master'

Author: StaticFX

bungeecord/src/main/java/de/staticred/discordbot/bungeecommands/MCVerifyCommandExecutor.java

@@ -8,6 +8,7 @@
 import de.staticred.discordbot.db.VerifyDAO;
 import de.staticred.discordbot.files.BlockedServerFileManager;
 import de.staticred.discordbot.files.ConfigFileManager;
+import de.staticred.discordbot.files.DiscordFileManager;
 import de.staticred.discordbot.files.DiscordMessageFileManager;
 import de.staticred.discordbot.util.Debugger;
 import de.staticred.discordbot.util.MemberManager;

bungeecord/src/main/java/de/staticred/discordbot/bungeecommands/dbcommand/subcommands/DBResetSubCommand.java

@@ -23,6 +23,8 @@ public void execute(String name, CommandSender sender, String[] args) {
             return;
         }
 
+
+
         if(args.length != 2) {
             sender.sendMessage(new TextComponent("§cUse: /db reset <player>"));
             return;

bungeecord/src/main/java/de/staticred/discordbot/bungeecommands/dbcommand/subcommands/DBUnlinkSubCommand.java

@@ -61,9 +61,9 @@ public void execute(String name, CommandSender sender, String[] args) {
         if(target != null) RewardManager.executeVerifyUnlinkProcess(target);
 
         try {
+            DBVerifier.getInstance().removeAllRolesFromMember(MemberManager.getMemberFromPlayer(uuid));
             VerifyDAO.INSTANCE.setPlayerAsUnVerified(uuid);
             VerifyDAO.INSTANCE.removeDiscordID(uuid);
-            DBVerifier.getInstance().removeAllRolesFromMember(MemberManager.getMemberFromPlayer(uuid));
             sender.sendMessage(new TextComponent(DBVerifier.getInstance().getStringFromConfig("UnlinkedPlayer",true)));
         } catch (SQLException e) {
             e.printStackTrace();

bungeecord/src/main/java/de/staticred/discordbot/files/DiscordFileManager.java

@@ -75,7 +75,7 @@ public void generateGroupConfig() {
             conf.set(string + ".groupName", string);
             conf.set(string + ".permission", "perm." + string);
             conf.set(string + ".dynamicGroup",false);
-            conf.set(string + ".prefix",string + " | %player%");
+            conf.set(string + ".prefix",string + " | %name%");
         }
         saveFile();
     }