See the README for updates

Dseym · Oct 25, 2020 · 0ecba2e · 0ecba2e
1 parent db7b999
commit 0ecba2e
Show file tree

Hide file tree

Showing 145 changed files with 1,936 additions and 866 deletions.
diff --git a/.classpath b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="C:/programming/minecraft/ProtocolLib.jar"/>
 	<classpathentry kind="lib" path="C:/Users/kirill/Desktop/игры/spigot 1.12.2/spigot-1.12.2.jar"/>
+	<classpathentry kind="lib" path="C:/programming/minecraft/ProtocolLib.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
@@ -1,17 +1,16 @@
 eclipse.preferences.version=1
-encoding//src/amongUs/Cameras.java=UTF-8
 encoding//src/amongUs/Commands.java=UTF-8
-encoding//src/amongUs/Door.java=UTF-8
-encoding//src/amongUs/Event.java=UTF-8
-encoding//src/amongUs/Game.java=UTF-8
-encoding//src/amongUs/Lobby.java=UTF-8
 encoding//src/amongUs/Main.java=UTF-8
-encoding//src/amongUs/Manhole.java=UTF-8
-encoding//src/amongUs/MapGame.java=UTF-8
-encoding//src/amongUs/MapManager.java=UTF-8
 encoding//src/amongUs/Messages.java=UTF-8
-encoding//src/amongUs/PlayerGame.java=UTF-8
-encoding//src/amongUs/Vote.java=UTF-8
+encoding//src/game/Cameras.java=UTF-8
+encoding//src/game/Door.java=UTF-8
+encoding//src/game/Game.java=UTF-8
+encoding//src/game/Lobby.java=UTF-8
+encoding//src/game/Manhole.java=UTF-8
+encoding//src/game/MapGame.java=UTF-8
+encoding//src/game/MapManager.java=UTF-8
+encoding//src/game/PlayerGame.java=UTF-8
+encoding//src/game/Vote.java=UTF-8
 encoding//src/tasks/Longs.java=UTF-8
 encoding//src/tasks/Sabotage.java=UTF-8
 encoding//src/tasks/Task.java=UTF-8

diff --git a/README.md b/README.md
@@ -5,14 +5,20 @@
 ## Description
 New minecraft mini-game based on the canon of the game Among Us! Complete tasks, look for imposters, or kill if you are an imposter yourself!
 
-### Updates 1.2.1
-1. Fixed encoding to UTF-8
-2. The messages.yml config is fully added
-3. Added the playerOnCount parameter to the game config - the number of players for auto start (value -1 - disable)
-4. Added new command /among setting list
-5. Fixed many bugs
+### Updates 1.3
+1. Added the ability to enter the lobby using signs
+```
+ Line1: [AmongUs]
+ Line2: *nameLobby*
+```
+2. Added a line to messages.yml (playerNotOwnerLobby)
+3. Added automatic game creation in the lobby
+4. Added a lobby owner and joining the lobby by the owner's nickname (/among joinNick nick)
+5. (For API) Added events for the beginning, end of the game, etc
+6. Added colored armor to players
+7. Fixed bug
 
-[Version 1.12.1](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/amongUs.jar)
+[Version 1.13](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/amongUs.jar)
 
 ## Commands
 /among help - get all commands
@@ -25,7 +31,7 @@ New minecraft mini-game based on the canon of the game Among Us! Complete tasks,
 5. among.command - send commands while playing
 
 ## Messages
-In file AmongUs/messages.yml. [Download](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/messages.yml)
+In file AmongUs/messages.yml. [Download](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/messages.yml)
 
 ## Game config
 In file AmongUs/gameConfig/example.yml (you can create your)
@@ -64,9 +70,9 @@ Video about the plugin (in Russian) - https://youtu.be/lHh4xp_ziro.
 4. Now you have the code that you can edit!
 
 ## Install for Server
-1. Download the compiled [AmongUs](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/amongUs.jar) and upload it to your server.
+1. Download the compiled [AmongUs](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/amongUs.jar) and upload it to your server.
 2. Download [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997) and upload it to your server.
-3. Upload [world.tar](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/world.tar) on server and unzip.
+3. Upload [world.tar](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/world.tar) on server and unzip.
 4. Have fun!
 
 If you need to translate the plugin into English, then write to Issues.
@@ -86,7 +92,7 @@ If you need to translate the plugin into English, then write to Issues.
 5. among.command - отправлять команды во время игры
 
 ## Сообщения
-В файле AmongUs/messages.yml. [Скачать](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/messages.yml)
+В файле AmongUs/messages.yml. [Скачать](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/messages.yml)
 
 ## Игровой конфиг(gameConfig)
 В файле AmongUs/gameConfig/example.yml (вы можете создать свой)
@@ -125,9 +131,9 @@ spawns:
 4. Теперь у Вас есть код для редактирования!
 
 ## Установка на сервер
-1. Скачайте скомпилированный [AmongUs](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/amongUs.jar) и загрузите на сервер.
+1. Скачайте скомпилированный [AmongUs](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/amongUs.jar) и загрузите на сервер.
 2. Скачайте [ProtocolLib](https://www.spigotmc.org/resources/protocollib.1997) и загрузите на сервер.
-3. Загрузите [world.tar](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.2/world.tar) на сервер и распакуйте.
+3. Загрузите [world.tar](https://github.com/Dseym/amongUsMinecraft/releases/download/AmongUs1.3/world.tar) на сервер и распакуйте.
 4. Веселись!
 
 Если нужен перевод на англиский, пишите в Issues.
diff --git a/bin/amongUs/Cameras$1.class b/bin/amongUs/Cameras$1.class
diff --git a/bin/amongUs/Cameras.class b/bin/amongUs/Cameras.class
diff --git a/bin/amongUs/Commands.class b/bin/amongUs/Commands.class
diff --git a/bin/amongUs/Config.class b/bin/amongUs/Config.class
diff --git a/bin/amongUs/Door$1.class b/bin/amongUs/Door$1.class
diff --git a/bin/amongUs/Event.class b/bin/amongUs/Event.class
diff --git a/bin/amongUs/Game$1.class b/bin/amongUs/Game$1.class
diff --git a/bin/amongUs/Game.class b/bin/amongUs/Game.class
diff --git a/bin/amongUs/Inv.class b/bin/amongUs/Inv.class
diff --git a/bin/amongUs/Lobby.class b/bin/amongUs/Lobby.class
diff --git a/bin/amongUs/Main$1$1.class b/bin/amongUs/Main$1$1.class
diff --git a/bin/amongUs/Main$1$2.class b/bin/amongUs/Main$1$2.class
diff --git a/bin/amongUs/Main$1.class b/bin/amongUs/Main$1.class
diff --git a/bin/amongUs/Main.class b/bin/amongUs/Main.class
diff --git a/bin/amongUs/MapManager.class b/bin/amongUs/MapManager.class
diff --git a/bin/amongUs/Messages.class b/bin/amongUs/Messages.class
diff --git a/bin/amongUs/PlayerGame.class b/bin/amongUs/PlayerGame.class
diff --git a/bin/amongUs/Protocol$1.class b/bin/amongUs/Protocol$1.class
diff --git a/bin/amongUs/Protocol$2.class b/bin/amongUs/Protocol$2.class
diff --git a/bin/amongUs/Protocol.class b/bin/amongUs/Protocol.class
diff --git a/bin/amongUs/Vote$1.class b/bin/amongUs/Vote$1.class
diff --git a/bin/amongUs/Vote.class b/bin/amongUs/Vote.class
diff --git a/bin/events/GameEndEvent.class b/bin/events/GameEndEvent.class
diff --git a/bin/events/GameStartEvent.class b/bin/events/GameStartEvent.class
diff --git a/bin/events/LobbyPlayerJoinEvent.class b/bin/events/LobbyPlayerJoinEvent.class
diff --git a/bin/events/LobbyPlayerLeaveEvent.class b/bin/events/LobbyPlayerLeaveEvent.class
diff --git a/bin/game/Cameras$1.class b/bin/game/Cameras$1.class
diff --git a/bin/game/Cameras.class b/bin/game/Cameras.class
diff --git a/bin/game/Color.class b/bin/game/Color.class
diff --git a/bin/game/Door$1.class b/bin/game/Door$1.class
diff --git a/bin/amongUs/Door.class → bin/game/Door.class b/bin/amongUs/Door.class → bin/game/Door.class
diff --git a/bin/game/Game$1.class b/bin/game/Game$1.class
diff --git a/bin/game/Game.class b/bin/game/Game.class
diff --git a/bin/game/Kits.class b/bin/game/Kits.class
diff --git a/bin/game/Lobby$1.class b/bin/game/Lobby$1.class
diff --git a/bin/amongUs/Lobby$1.class → bin/game/Lobby$2.class b/bin/amongUs/Lobby$1.class → bin/game/Lobby$2.class
diff --git a/bin/game/Lobby$3.class b/bin/game/Lobby$3.class
diff --git a/bin/game/Lobby.class b/bin/game/Lobby.class
diff --git a/bin/game/LobbySign$1.class b/bin/game/LobbySign$1.class
diff --git a/bin/game/LobbySign$2.class b/bin/game/LobbySign$2.class
diff --git a/bin/game/LobbySign.class b/bin/game/LobbySign.class
diff --git a/bin/amongUs/Manhole.class → bin/game/Manhole.class b/bin/amongUs/Manhole.class → bin/game/Manhole.class
diff --git a/bin/amongUs/MapGame.class → bin/game/MapGame.class b/bin/amongUs/MapGame.class → bin/game/MapGame.class
diff --git a/bin/game/MapManager.class b/bin/game/MapManager.class
diff --git a/bin/game/PlayerGame.class b/bin/game/PlayerGame.class
diff --git a/bin/game/Vote$1.class b/bin/game/Vote$1.class
diff --git a/bin/amongUs/Vote$2.class → bin/game/Vote$2.class b/bin/amongUs/Vote$2.class → bin/game/Vote$2.class
diff --git a/bin/game/Vote.class b/bin/game/Vote.class
diff --git a/bin/listeners/CancelListener.class b/bin/listeners/CancelListener.class
diff --git a/bin/listeners/ClickTaskListener.class b/bin/listeners/ClickTaskListener.class
diff --git a/bin/listeners/GameEndListener.class b/bin/listeners/GameEndListener.class
diff --git a/bin/listeners/ImpostorListener.class b/bin/listeners/ImpostorListener.class
diff --git a/bin/listeners/MeetingListener.class b/bin/listeners/MeetingListener.class
diff --git a/bin/listeners/ReportBodyListener.class b/bin/listeners/ReportBodyListener.class
diff --git a/bin/listeners/ServerListener.class b/bin/listeners/ServerListener.class
diff --git a/bin/tasks/Longs.class b/bin/tasks/Longs.class
diff --git a/bin/tasks/Sabotage$1.class b/bin/tasks/Sabotage$1.class
diff --git a/bin/tasks/Sabotage.class b/bin/tasks/Sabotage.class
diff --git a/bin/tasks/Task$1.class b/bin/tasks/Task$1.class
diff --git a/bin/tasks/Task$2.class b/bin/tasks/Task$2.class
diff --git a/bin/tasks/Task$3.class b/bin/tasks/Task$3.class
diff --git a/bin/tasks/Task$4.class b/bin/tasks/Task$4.class
diff --git a/bin/tasks/Task.class b/bin/tasks/Task.class
diff --git a/bin/tasks/list/CalibrateDistr$2.class b/bin/tasks/list/CalibrateDistr$2.class
diff --git a/bin/tasks/list/CalibrateDistr.class b/bin/tasks/list/CalibrateDistr.class
diff --git a/bin/tasks/list/Card$1.class b/bin/tasks/list/Card$1.class
diff --git a/bin/tasks/list/Card.class b/bin/tasks/list/Card.class
diff --git a/bin/tasks/list/ClearOxygen$1.class b/bin/tasks/list/ClearOxygen$1.class
diff --git a/bin/tasks/list/ClearOxygen.class b/bin/tasks/list/ClearOxygen.class
diff --git a/bin/tasks/list/Energy$1.class b/bin/tasks/list/Energy$1.class
diff --git a/bin/tasks/list/Energy.class b/bin/tasks/list/Energy.class
diff --git a/bin/tasks/list/Meteor$1.class b/bin/tasks/list/Meteor$1.class
diff --git a/bin/tasks/list/Meteor.class b/bin/tasks/list/Meteor.class
diff --git a/bin/tasks/list/Rabbish$1.class b/bin/tasks/list/Rabbish$1.class
diff --git a/bin/tasks/list/Rabbish.class b/bin/tasks/list/Rabbish.class
diff --git a/bin/tasks/list/Reactor$1.class b/bin/tasks/list/Reactor$1.class
diff --git a/bin/tasks/list/Reactor.class b/bin/tasks/list/Reactor.class
diff --git a/bin/tasks/list/Refuel$1.class b/bin/tasks/list/Refuel$1.class
diff --git a/bin/tasks/list/Refuel.class b/bin/tasks/list/Refuel.class
diff --git a/bin/tasks/list/SabotageCommunicate$1.class b/bin/tasks/list/SabotageCommunicate$1.class
diff --git a/bin/tasks/list/SabotageCommunicate$2.class b/bin/tasks/list/SabotageCommunicate$2.class
diff --git a/bin/tasks/list/SabotageCommunicate.class b/bin/tasks/list/SabotageCommunicate.class
diff --git a/bin/tasks/list/SabotageElectrical$1.class b/bin/tasks/list/SabotageElectrical$1.class
diff --git a/bin/tasks/list/SabotageElectrical$2.class b/bin/tasks/list/SabotageElectrical$2.class
diff --git a/bin/tasks/list/SabotageElectrical.class b/bin/tasks/list/SabotageElectrical.class
diff --git a/bin/tasks/list/SabotageOxygen$1.class b/bin/tasks/list/SabotageOxygen$1.class
diff --git a/bin/tasks/list/SabotageOxygen$2.class b/bin/tasks/list/SabotageOxygen$2.class
diff --git a/bin/tasks/list/SabotageOxygen.class b/bin/tasks/list/SabotageOxygen.class
diff --git a/bin/tasks/list/SabotageReactor$1.class b/bin/tasks/list/SabotageReactor$1.class
diff --git a/bin/tasks/list/SabotageReactor$2.class b/bin/tasks/list/SabotageReactor$2.class
diff --git a/bin/tasks/list/SabotageReactor.class b/bin/tasks/list/SabotageReactor.class
diff --git a/bin/tasks/list/Scan$1.class b/bin/tasks/list/Scan$1.class
diff --git a/bin/tasks/list/Scan.class b/bin/tasks/list/Scan.class
diff --git a/bin/tasks/list/Shield$1.class b/bin/tasks/list/Shield$1.class
diff --git a/bin/tasks/list/Shield.class b/bin/tasks/list/Shield.class
diff --git a/bin/tasks/list/ShipWay$1.class b/bin/tasks/list/ShipWay$1.class
diff --git a/bin/tasks/list/ShipWay.class b/bin/tasks/list/ShipWay.class
diff --git a/bin/tasks/list/StabilizeDrive$1.class b/bin/tasks/list/StabilizeDrive$1.class
diff --git a/bin/tasks/list/StabilizeDrive.class b/bin/tasks/list/StabilizeDrive.class
diff --git a/bin/tasks/list/StabilizeWay$1.class b/bin/tasks/list/StabilizeWay$1.class
diff --git a/bin/tasks/list/StabilizeWay.class b/bin/tasks/list/StabilizeWay.class
diff --git a/bin/tasks/list/UnlockManifold$1.class b/bin/tasks/list/UnlockManifold$1.class
diff --git a/bin/tasks/list/UnlockManifold.class b/bin/tasks/list/UnlockManifold.class
diff --git a/bin/tasks/list/Wiring$1.class b/bin/tasks/list/Wiring$1.class
diff --git a/bin/tasks/list/Wiring.class b/bin/tasks/list/Wiring.class
diff --git a/plugin.yml b/plugin.yml
@@ -1,5 +1,5 @@
 name: AmongUs
-version: 1.2.1
+version: 1.3
 main: amongUs.Main
 commands:
   among:

diff --git a/src/amongUs/Commands.java b/src/amongUs/Commands.java
@@ -1,17 +1,18 @@
 package amongUs;
 
-import java.io.File;
-import java.io.IOException;
 import java.lang.reflect.Field;
 
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 
+import game.Game;
+import game.Lobby;
+
 public class Commands implements CommandExecutor {
 
 	@Override
@@ -37,6 +38,8 @@ else if(args[0].equalsIgnoreCase("setLobby"))
 			setLobby(sender, args);
 		else if(args[0].equalsIgnoreCase("list"))
 			list(sender);
+		else if(args[0].equalsIgnoreCase("joinNick"))
+			joinNick(sender, args);
 		else if(args[0].equalsIgnoreCase("help"))
 			help(sender);
 		else 
@@ -60,6 +63,13 @@ private void list(CommandSender sender) {
 
 	private void setLobby(CommandSender sender, String[] args) {
 
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
 		if(!sender.hasPermission("among.lobby")) {
 
 			sender.sendMessage(Main.tagPlugin + Messages.notPerm);
@@ -84,19 +94,24 @@ private void setLobby(CommandSender sender, String[] args) {
 		else
 			lobby.setLoc(loc);
 
-		File file = new File(Main.plugin.getDataFolder() + File.separator + "config.yml");
-		FileConfiguration config = (FileConfiguration) YamlConfiguration.loadConfiguration(file);
-
-		config.set(args[1] + ".location", loc.getWorld().getName() + "," + loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ());
+		String key = args[1] + ".location";
+		String value = loc.getWorld().getName() + "," + loc.getBlockX() + "," + loc.getBlockY() + "," + loc.getBlockZ();
 
-		try {config.save(file);} catch (IOException e) {}
+		Config.saveConfig("config", key, value);
 
 		sender.sendMessage(Main.tagPlugin + Messages.success);
 
 	}
 
 	private void leave(CommandSender sender) {
 
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
 		Lobby lobby = Lobby.getLobby((Player)sender);
 		if(lobby == null) {
 
@@ -112,27 +127,25 @@ private void leave(CommandSender sender) {
 
 	private void join(CommandSender sender, String[] args) {
 
-		if(args.length == 1) {
-
-			sender.sendMessage(Main.tagPlugin + Messages.lacksArgs);
+		if(!(sender instanceof Player)) {
 
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
 			return;
 
 		}
 
-		Lobby lobby = Lobby.getLobby(args[1]);
-		if(lobby == null) {
+		if(args.length == 1) {
 
-			sender.sendMessage(Main.tagPlugin + Messages.lobbyNotFound);
+			sender.sendMessage(Main.tagPlugin + Messages.lacksArgs);
 
 			return;
 
 		}
 
-		Lobby lobby2 = Lobby.getLobby((Player)sender);
-		if(lobby2 != null) {
+		Lobby lobby = Lobby.getLobby(args[1]);
+		if(lobby == null) {
 
-			sender.sendMessage(Main.tagPlugin + Messages.plInLobby);
+			sender.sendMessage(Main.tagPlugin + Messages.lobbyNotFound);
 
 			return;
 
@@ -144,6 +157,13 @@ private void join(CommandSender sender, String[] args) {
 
 	private void setSetting(CommandSender sender, String[] args) {
 
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
 		Lobby lobby = Lobby.getLobby((Player)sender);
 		if(lobby == null) {
 
@@ -185,7 +205,7 @@ private void setSetting(CommandSender sender, String[] args) {
 
 		}
 
-		if(!sender.hasPermission("among.setting")) {
+		if(!sender.hasPermission("among.setting") && !sender.hasPermission("among.setting")) {
 
 			sender.sendMessage(Main.tagPlugin + Messages.notPerm);
 
@@ -237,6 +257,13 @@ private void setSetting(CommandSender sender, String[] args) {
 
 	private void listSettings(CommandSender sender, Lobby lobby) {
 
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
 		Game game = lobby.getGame();
 
 		sender.sendMessage(Main.tagPlugin +
@@ -291,6 +318,13 @@ private void voteOpenInv(CommandSender sender) {
 
 	private void start(CommandSender sender) {
 
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
 		Lobby lobby = Lobby.getLobby((Player)sender);
 		if(lobby == null) {
 
@@ -300,7 +334,7 @@ private void start(CommandSender sender) {
 
 		}
 
-		if(!sender.hasPermission("among.start")) {
+		if(!sender.hasPermission("among.start") && !sender.hasPermission("among.setting")) {
 
 			sender.sendMessage(Main.tagPlugin + Messages.notPerm);
 
@@ -336,6 +370,13 @@ private void start(CommandSender sender) {
 
 	private void create(CommandSender sender, String[] args) {
 
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
 		Lobby lobby = Lobby.getLobby((Player)sender);
 		if(lobby == null) {
 
@@ -345,7 +386,7 @@ private void create(CommandSender sender, String[] args) {
 
 		}
 
-		if(!sender.hasPermission("among.create")) {
+		if(!sender.hasPermission("among.create") && !sender.hasPermission("among.setting")) {
 
 			sender.sendMessage(Main.tagPlugin + Messages.notPerm);
 
@@ -369,19 +410,11 @@ private void create(CommandSender sender, String[] args) {
 
 		}
 
-		try {
-
-			File fileConfigGame = new File(Main.plugin.getDataFolder() + File.separator + "gameConfig" + File.separator + args[1] + ".yml");
-			FileConfiguration configGame = (FileConfiguration) YamlConfiguration.loadConfiguration(fileConfigGame);
-
-			lobby.createGame(configGame);
-
-		} catch (Exception e) {
-
+		FileConfiguration configGame = Config.loadGameConfig(args[1]);
+		if(configGame == null)
 			sender.sendMessage(Main.tagPlugin + Messages.notFoundConfig);
-			e.printStackTrace();
-
-		}
+		else
+			lobby.createGame(configGame);
 
 	}
 
@@ -439,6 +472,45 @@ private void vote(CommandSender sender, String[] args) {
 
 	}
 
+	private void joinNick(CommandSender sender, String[] args) {
+
+		if(!(sender instanceof Player)) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.senderNotPl);
+			return;
+
+		}
+
+		if(args.length == 1) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.lacksArgs);
+
+			return;
+
+		}
+
+		Player p = Bukkit.getPlayer(args[1]);
+		if(p == null || Lobby.getLobby(p) == null) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.playerNotFound);
+
+			return;
+
+		}
+
+		Lobby lobby = Lobby.getLobbyForOwner(p);
+		if(lobby == null) {
+
+			sender.sendMessage(Main.tagPlugin + Messages.playerNotOwnerLobby);
+
+			return;
+
+		}
+
+		Lobby.getLobbyForOwner(p).join((Player)sender);
+
+	}
+
 	private void help(CommandSender sender) {
 
 		sender.sendMessage(Main.tagPlugin + Messages.helpMenu);