From d5415955c52f8cbc7afc2385c89bd95eb351f087 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Thu, 5 May 2016 14:29:35 +0200 Subject: [PATCH] Map creation with a map name in use is now forbidden --- .../dre2n/dungeonsxl/command/ChatCommand.java | 2 +- .../dungeonsxl/command/CreateCommand.java | 67 ++++++++++--------- .../dre2n/dungeonsxl/command/EditCommand.java | 2 +- .../dungeonsxl/command/EnterCommand.java | 2 +- .../dungeonsxl/command/EscapeCommand.java | 2 +- .../dungeonsxl/command/GroupCommand.java | 27 +++++--- .../dungeonsxl/command/LeaveCommand.java | 2 +- .../dungeonsxl/command/LivesCommand.java | 2 +- .../dre2n/dungeonsxl/command/PlayCommand.java | 2 +- .../dungeonsxl/command/PortalCommand.java | 2 +- .../dre2n/dungeonsxl/command/TestCommand.java | 2 +- .../dre2n/dungeonsxl/config/DMessages.java | 1 + .../event/dplayer/DPlayerJoinDGroupEvent.java | 2 +- .../dplayer/DPlayerLeaveDGroupEvent.java | 2 +- .../dre2n/dungeonsxl/global/LeaveSign.java | 2 +- .../dungeonsxl/listener/EntityListener.java | 2 +- .../dungeonsxl/listener/PlayerListener.java | 2 +- .../dre2n/dungeonsxl/reward/RewardChest.java | 2 +- .../dre2n/dungeonsxl/sign/ReadySign.java | 2 +- .../dre2n/dungeonsxl/task/SecureModeTask.java | 2 +- .../dungeonsxl/task/TimeIsRunningTask.java | 2 +- .../dre2n/dungeonsxl/world/EditWorld.java | 2 +- .../dre2n/dungeonsxl/world/GameWorld.java | 2 +- .../dre2n/dungeonsxl/game/CustomGameType.java | 1 - .../requirement/AwesomenessRequirement.java | 2 - .../requirement/RequirementTypeCustom.java | 3 - .../reward/HighwayToHellReward.java | 2 - .../dungeonsxl/reward/RewardTypeCustom.java | 3 - .../dre2n/dungeonsxl/sign/CustomSign.java | 2 - .../dungeonsxl/sign/DSignTypeCustom.java | 2 - .../dungeonsxl/trigger/CustomTrigger.java | 2 - .../dungeonsxl/trigger/TriggerTypeCustom.java | 3 - 32 files changed, 71 insertions(+), 84 deletions(-) diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java index 2c106f9b..988da015 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java index bd77f080..c8771983 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java +++ b/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,25 +49,30 @@ 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()); + // Msg create + MessageUtil.log(plugin, DMessages.LOG_NEW_DUNGEON.getMessage()); + MessageUtil.log(plugin, DMessages.LOG_GENERATE_NEW_WORLD.getMessage()); - // Create World - EditWorld editWorld = new EditWorld(); - editWorld.generate(); - editWorld.setMapName(name); - editWorld.save(); - editWorld.delete(); + // Create World + EditWorld editWorld = new EditWorld(); + editWorld.generate(); + editWorld.setMapName(name); + editWorld.save(); + editWorld.delete(); - // MSG Done - MessageUtil.log(plugin, DMessages.LOG_WORLD_GENERATION_FINISHED.getMessage()); - - } else { - MessageUtil.sendMessage(sender, DMessages.ERROR_NAME_TO_LONG.getMessage()); - } + // MSG Done + MessageUtil.log(plugin, DMessages.LOG_WORLD_GENERATION_FINISHED.getMessage()); } else if (sender instanceof Player) { Player player = (Player) sender; @@ -76,25 +82,20 @@ 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()); + // Msg create + MessageUtil.log(plugin, DMessages.LOG_NEW_DUNGEON.getMessage()); + MessageUtil.log(plugin, DMessages.LOG_GENERATE_NEW_WORLD.getMessage()); - // Create World - EditWorld editWorld = new EditWorld(); - editWorld.generate(); - editWorld.setMapName(name); + // Create World + EditWorld editWorld = new EditWorld(); + editWorld.generate(); + editWorld.setMapName(name); - // MSG Done - MessageUtil.log(plugin, DMessages.LOG_WORLD_GENERATION_FINISHED.getMessage()); + // MSG Done + MessageUtil.log(plugin, DMessages.LOG_WORLD_GENERATION_FINISHED.getMessage()); - // Tp Player - new DGamePlayer(player, editWorld.getWorld(), true); - - } else { - MessageUtil.sendMessage(player, DMessages.ERROR_NAME_TO_LONG.getMessage()); - } + // Tp Player + new DGamePlayer(player, editWorld.getWorld(), true); } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java index 1a9fe85a..d62e5679 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java index 17b564d5..2b85ffc4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java index 90316c3a..08c16b45 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java index 7d5775de..29debb39 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java +++ b/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,20 +108,25 @@ public class GroupCommand extends BRCommand { } public void createGroup() { - if (DGroup.getByPlayer(player) == null && DGroup.getByName(args[2]) == null) { - DGroup dGroup = new DGroup(args[2], player); - DGroupCreateEvent event = new DGroupCreateEvent(dGroup, player, DGroupCreateEvent.Cause.COMMAND); + if (DGroup.getByPlayer(player) != null) { + MessageUtil.sendMessage(sender, DMessages.ERROR_LEAVE_GROUP.getMessage()); + return; + } - if (event.isCancelled()) { - dGroup.delete(); - dGroup = null; + if (DGroup.getByName(args[2]) == null) { + MessageUtil.sendMessage(sender, DMessages.ERROR_NAME_IN_USE.getMessage(args[2])); + return; + } - } else { - MessageUtil.sendMessage(sender, DMessages.GROUP_CREATED.getMessage(sender.getName(), args[2])); - } + DGroup dGroup = new DGroup(args[2], player); + DGroupCreateEvent event = new DGroupCreateEvent(dGroup, player, DGroupCreateEvent.Cause.COMMAND); + + if (event.isCancelled()) { + dGroup.delete(); + dGroup = null; } else { - MessageUtil.sendMessage(sender, DMessages.ERROR_LEAVE_GROUP.getMessage()); + MessageUtil.sendMessage(sender, DMessages.GROUP_CREATED.getMessage(sender.getName(), args[2])); } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java index bb3bd910..e9adfc12 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java index 42ec9836..8bbdb716 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java index d434968e..094d145c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java index 9c2c6d38..29f86dd5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java index d064e26f..9d5b5e21 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java b/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java index a497bafb..21888a27 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java +++ b/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 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."), diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java b/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java index 7e0a414f..86f6835e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java b/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java index 1efa5274..b7c5df4b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java b/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java index 521dc2e3..ac5218c4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java b/src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java index c19e6361..32b914b4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java b/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java index 4ec8c6bb..faad252d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java b/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java index 4c0ff49c..675ffcb0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java index 21e2e1aa..55b0a445 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java b/src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java index bac34ebf..214d1b41 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java b/src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java index 0184c614..44c80412 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java index 69545318..85319408 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java +++ b/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)) { diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java index 03f3f83c..d8579174 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java +++ b/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; diff --git a/src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java b/src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java index f087cd0d..da570b5a 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java +++ b/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; /** diff --git a/src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java b/src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java index 68def86f..a2a0ef9c 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java +++ b/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; /** diff --git a/src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java b/src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java index 3e42bf52..a46ac744 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java +++ b/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 */ diff --git a/src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java b/src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java index a0509835..3f6a09a6 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java +++ b/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; diff --git a/src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java b/src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java index 98006ca1..c8a1053b 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java +++ b/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 */ diff --git a/src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java b/src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java index d5edb248..f046021a 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java +++ b/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; diff --git a/src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java b/src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java index d723f1bd..537fede3 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java +++ b/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 diff --git a/src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java b/src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java index 15e7be04..2f72acc4 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java +++ b/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; diff --git a/src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java b/src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java index a8796926..42d696fd 100644 --- a/src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java +++ b/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 */