diff --git a/Plugins/.idea/compiler.xml b/Plugins/.idea/compiler.xml
index 3fa9384b3..bd35e0f52 100644
--- a/Plugins/.idea/compiler.xml
+++ b/Plugins/.idea/compiler.xml
@@ -26,7 +26,6 @@
-
diff --git a/Plugins/.idea/modules.xml b/Plugins/.idea/modules.xml
index b8ed3a047..bf0ac4bae 100644
--- a/Plugins/.idea/modules.xml
+++ b/Plugins/.idea/modules.xml
@@ -11,6 +11,7 @@
+
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
index 05d3129cd..c651d6ea1 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/event/EventModule.java
@@ -7,6 +7,7 @@ import java.util.LinkedList;
import java.util.List;
import mineplex.core.MiniPlugin;
+import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.NautHashMap;
@@ -78,7 +79,7 @@ public class EventModule extends MiniPlugin
@EventHandler
public void setHostDebug(PlayerCommandPreprocessEvent event)
{
- if (!event.getPlayer().isOp())
+ if (!Manager.GetClients().Get(event.getPlayer()).GetRank().Has(event.getPlayer(), Rank.JNR_DEV, true))
return;
if (!event.getMessage().toLowerCase().startsWith("/sethost "))
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
index 1dbc380a9..d350f9389 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java
@@ -34,6 +34,7 @@ public class ChooseMapButton implements IButton
public void onClick(Player player, ClickType clickType)
{
_arcadeManager.GetGameCreationManager().MapPref = _map;
+ _arcadeManager.GetGameCreationManager().MapSource = _gameType.GetName();
_arcadeManager.GetGame().setGame(_gameType, player, true);
player.closeInventory();
return;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
index 96a719071..fcd792096 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
@@ -210,7 +210,7 @@ public class GameHostManager implements Listener
if (!getWhitelist().contains(p.getName())){
if (_host == p)
return;
- Manager.GetPortal().sendToHub(p, "You aren't on the whitelist of this Mineplex Private Server.");
+ event.disallow(PlayerLoginEvent.Result.KICK_WHITELIST, "This MPS is whitelisted.");
}
}
}
@@ -360,6 +360,20 @@ public class GameHostManager implements Listener
return _adminList;
}
+ @EventHandler
+ public void getAdmin(PlayerCommandPreprocessEvent event)
+ {
+ if (!event.getMessage().equalsIgnoreCase("/getadmin"))
+ return;
+
+ event.setCancelled(true);
+
+ if (!Manager.GetClients().Get(event.getPlayer()).GetRank().Has(event.getPlayer(), Rank.JNR_DEV, true))
+ return;
+
+ giveAdmin(event.getPlayer());
+ }
+
@EventHandler
public void broadcastCommand(PlayerCommandPreprocessEvent event)
{