JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

This commit is contained in:
libraryaddict 2015-07-08 18:43:56 +12:00
parent 1f250bf951 ca880371a6
commit 7e3fdef2e8
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
View File

@ -19,6 +19,7 @@
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
<element id="module-output" name="Mineplex.Database" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
</root>
</artifact>
</component>

5
Plugins/.idea/codeStyleSettings.xml
View File

@ -37,7 +37,6 @@
</codeStyleSettings>
</value>
</option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
</component>
</project>
</project>

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
View File

@ -1,5 +1,7 @@
package nautilus.game.arcade.command;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import org.bukkit.entity.Player;
import nautilus.game.arcade.ArcadeManager;
@ -20,6 +22,10 @@ public class GameCommand extends MultiCommandBase<ArcadeManager>
@Override
protected void Help(Player caller, String[] args)
{
UtilPlayer.message(caller, F.main(Plugin.getName(), "Commands List:"));
UtilPlayer.message(caller, F.help("/game start", "Start the current game", Rank.ADMIN));
UtilPlayer.message(caller, F.help("/game stop", "Stop the current game", Rank.ADMIN));
UtilPlayer.message(caller, F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
UtilPlayer.message(caller, F.main("Tip", "Use TAB for games/maps!"));
}
}

25
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
View File

@ -1,19 +1,18 @@
package nautilus.game.arcade.command;
import java.util.ArrayList;
import java.util.List;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.game.Game.GameState;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilPlayer;
import java.util.ArrayList;
import java.util.List;
public class SetCommand extends CommandBase<ArcadeManager>
{
@ -28,9 +27,9 @@ public class SetCommand extends CommandBase<ArcadeManager>
if (Plugin.GetGame() == null)
return;
if (args.length == 0)
if (args == null || args.length == 0)
{
caller.sendMessage("/game set <GameType> (Map)");
caller.sendMessage(F.help("/game set <GameType> (Map)", "Set the current game or next game", Rank.ADMIN));
return;
}
@ -43,7 +42,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
}
//Parse Game
ArrayList<GameType> matches = new ArrayList<GameType>();
ArrayList<GameType> matches = new ArrayList<>();
for (GameType type : GameType.values())
{
if (type.toString().toLowerCase().equals(game))