Map creation with a map name in use is now forbidden

src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java

@@ -20,8 +20,8 @@ import io.github.dre2n.commons.command.BRCommand;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
-import io.github.dre2n.dungeonsxl.player.DPermissions;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DPermissions;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java

@@ -20,9 +20,10 @@ import io.github.dre2n.commons.command.BRCommand;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
-import io.github.dre2n.dungeonsxl.player.DPermissions;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DPermissions;
 import io.github.dre2n.dungeonsxl.world.EditWorld;
+import java.io.File;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
@@ -48,8 +49,17 @@ public class CreateCommand extends BRCommand {
     public void onExecute(String[] args, CommandSender sender) {
         String name = args[1];
 
+        if (new File(plugin.getDataFolder(), "/maps/" + name).exists()) {
+            MessageUtil.sendMessage(sender, DMessages.ERROR_NAME_IN_USE.getMessage(name));
+            return;
+        }
+
+        if (name.length() > 15) {
+            MessageUtil.sendMessage(sender, DMessages.ERROR_NAME_TO_LONG.getMessage());
+            return;
+        }
+
         if (sender instanceof ConsoleCommandSender) {
-            if (name.length() <= 15) {
             // Msg create
             MessageUtil.log(plugin, DMessages.LOG_NEW_DUNGEON.getMessage());
             MessageUtil.log(plugin, DMessages.LOG_GENERATE_NEW_WORLD.getMessage());
@@ -64,10 +74,6 @@ public class CreateCommand extends BRCommand {
             // MSG Done
             MessageUtil.log(plugin, DMessages.LOG_WORLD_GENERATION_FINISHED.getMessage());
 
-            } else {
-                MessageUtil.sendMessage(sender, DMessages.ERROR_NAME_TO_LONG.getMessage());
-            }
-
         } else if (sender instanceof Player) {
             Player player = (Player) sender;
 
@@ -76,7 +82,6 @@ public class CreateCommand extends BRCommand {
                 return;
             }
 
-            if (name.length() <= 15) {
             // Msg create
             MessageUtil.log(plugin, DMessages.LOG_NEW_DUNGEON.getMessage());
             MessageUtil.log(plugin, DMessages.LOG_GENERATE_NEW_WORLD.getMessage());
@@ -91,10 +96,6 @@ public class CreateCommand extends BRCommand {
 
             // Tp Player
             new DGamePlayer(player, editWorld.getWorld(), true);
-
-            } else {
-                MessageUtil.sendMessage(player, DMessages.ERROR_NAME_TO_LONG.getMessage());
-            }
         }
     }
 

src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java

@@ -20,9 +20,9 @@ import io.github.dre2n.commons.command.BRCommand;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java

@@ -21,9 +21,9 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.game.Game;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java

@@ -20,9 +20,9 @@ import io.github.dre2n.commons.command.BRCommand;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java

@@ -23,9 +23,9 @@ import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupDisbandEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -108,7 +108,16 @@ public class GroupCommand extends BRCommand {
     }
 
     public void createGroup() {
-        if (DGroup.getByPlayer(player) == null && DGroup.getByName(args[2]) == null) {
+        if (DGroup.getByPlayer(player) != null) {
+            MessageUtil.sendMessage(sender, DMessages.ERROR_LEAVE_GROUP.getMessage());
+            return;
+        }
+
+        if (DGroup.getByName(args[2]) == null) {
+            MessageUtil.sendMessage(sender, DMessages.ERROR_NAME_IN_USE.getMessage(args[2]));
+            return;
+        }
+
         DGroup dGroup = new DGroup(args[2], player);
         DGroupCreateEvent event = new DGroupCreateEvent(dGroup, player, DGroupCreateEvent.Cause.COMMAND);
 
@@ -119,10 +128,6 @@ public class GroupCommand extends BRCommand {
         } else {
             MessageUtil.sendMessage(sender, DMessages.GROUP_CREATED.getMessage(sender.getName(), args[2]));
         }
-
-        } else {
-            MessageUtil.sendMessage(sender, DMessages.ERROR_LEAVE_GROUP.getMessage());
-        }
     }
 
     public void disbandGroup(DGroup dGroup) {

src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java

@@ -22,9 +22,9 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerEscapeEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerLeaveDGroupEvent;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java

@@ -20,8 +20,8 @@ import io.github.dre2n.commons.command.BRCommand;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
-import io.github.dre2n.dungeonsxl.player.DPermissions;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DPermissions;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java

@@ -24,9 +24,9 @@ import io.github.dre2n.dungeonsxl.config.DungeonConfig;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.io.File;

src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java

@@ -21,9 +21,9 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.global.DPortal;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import org.bukkit.Material;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java

@@ -22,9 +22,9 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java

@@ -64,6 +64,7 @@ public enum DMessages implements Messages {
     ERROR_MSG_ID_NOT_EXIST("Error_MsgIdNotExist", "&4Messages with Id &6&v1&4 does not exist!"),
     ERROR_MSG_FORMAT("Error_MsgFormat", "&4The Messages has to be between \"!"),
     ERROR_MSG_NO_INT("Error_MsgNoInt", "&4Argument <id> has to include a number!"),
+    ERROR_NAME_IN_USE("Error_NameInUse", "&4The name &6&v1 &4is already in use."),
     ERROR_NAME_TO_LONG("Error_NameToLong", "&4The name may not be longer than 15 characters!"),
     ERROR_NO_CONSOLE_COMMAND("Error_NoConsoleCommand", "&6/dxl &v1&4 cannot be executed as console!"),
     ERROR_NO_GAME("Error_NoGame", "&4You currently do not take part in a game."),

src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.event.dplayer;
 
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.event.dplayer;
 
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java

@@ -19,8 +19,8 @@ package io.github.dre2n.dungeonsxl.global;
 import io.github.dre2n.commons.util.BlockUtil;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessages;
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import java.util.HashSet;
 import java.util.Set;
 import org.bukkit.ChatColor;

src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java

@@ -22,8 +22,8 @@ import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
 import io.github.dre2n.dungeonsxl.mob.DMob;
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java

@@ -28,10 +28,10 @@ import io.github.dre2n.dungeonsxl.global.GameSign;
 import io.github.dre2n.dungeonsxl.global.GlobalProtection;
 import io.github.dre2n.dungeonsxl.global.GroupSign;
 import io.github.dre2n.dungeonsxl.global.LeaveSign;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DPlayers;
 import io.github.dre2n.dungeonsxl.player.DSavePlayer;
 import io.github.dre2n.dungeonsxl.reward.DLootInventory;

src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java

@@ -19,8 +19,8 @@ package io.github.dre2n.dungeonsxl.reward;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import net.milkbowl.vault.item.ItemInfo;
 import net.milkbowl.vault.item.Items;

src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java

@@ -21,8 +21,8 @@ import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.ChatColor;

src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java

@@ -18,9 +18,9 @@ package io.github.dre2n.dungeonsxl.task;
 
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.player.DEditPlayer;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java

@@ -21,8 +21,8 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessages;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent;
-import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
+import io.github.dre2n.dungeonsxl.player.DGroup;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;

src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java

@@ -300,7 +300,7 @@ public class EditWorld {
         }
     }
 
-    // Static
+    /* Statics */
     public static EditWorld getByWorld(World world) {
         for (EditWorld editWorld : plugin.getEditWorlds()) {
             if (editWorld.world.equals(world)) {

src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java

@@ -29,9 +29,9 @@ import io.github.dre2n.dungeonsxl.event.requirement.RequirementCheckEvent;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GamePlaceableBlock;
 import io.github.dre2n.dungeonsxl.mob.DMob;
+import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.requirement.Requirement;
 import io.github.dre2n.dungeonsxl.reward.RewardChest;
 import io.github.dre2n.dungeonsxl.sign.DSign;

src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java

@@ -16,7 +16,6 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
-import io.github.dre2n.dungeonsxl.game.GameType;
 import org.bukkit.GameMode;
 
 /**

src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java

@@ -17,8 +17,6 @@
 package io.github.dre2n.dungeonsxl.requirement;
 
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
-import io.github.dre2n.dungeonsxl.requirement.Requirement;
-import io.github.dre2n.dungeonsxl.requirement.RequirementType;
 import org.bukkit.entity.Player;
 
 /**

src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java

@@ -16,9 +16,6 @@
  */
 package io.github.dre2n.dungeonsxl.requirement;
 
-import io.github.dre2n.dungeonsxl.requirement.Requirement;
-import io.github.dre2n.dungeonsxl.requirement.RequirementType;
-
 /**
  * @author Daniel Saukel
  */

src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java

@@ -18,8 +18,6 @@ package io.github.dre2n.dungeonsxl.reward;
 
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessages;
-import io.github.dre2n.dungeonsxl.reward.Reward;
-import io.github.dre2n.dungeonsxl.reward.RewardType;
 import java.util.Arrays;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;

src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java

@@ -16,9 +16,6 @@
  */
 package io.github.dre2n.dungeonsxl.reward;
 
-import io.github.dre2n.dungeonsxl.reward.Reward;
-import io.github.dre2n.dungeonsxl.reward.RewardType;
-
 /**
  * @author Daniel Saukel
  */

src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java

@@ -16,8 +16,6 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.dungeonsxl.sign.DSign;
-import io.github.dre2n.dungeonsxl.sign.DSignType;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;

src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java

@@ -17,8 +17,6 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.dungeonsxl.player.DPermissions;
-import io.github.dre2n.dungeonsxl.sign.DSign;
-import io.github.dre2n.dungeonsxl.sign.DSignType;
 
 /**
  * @author Daniel Saukel

src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java

@@ -17,8 +17,6 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.trigger.Trigger;
-import io.github.dre2n.dungeonsxl.trigger.TriggerType;
 import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;

src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java

@@ -16,9 +16,6 @@
  */
 package io.github.dre2n.dungeonsxl.trigger;
 
-import io.github.dre2n.dungeonsxl.trigger.Trigger;
-import io.github.dre2n.dungeonsxl.trigger.TriggerType;
-
 /**
  * @author Daniel Saukel
  */