Merge remote-tracking branch 'origin/master'

This commit is contained in:
Daniel Mills 2020-12-13 09:38:20 -05:00
commit 9d18a1297b
4 changed files with 15 additions and 5 deletions

View File

@ -79,7 +79,18 @@ public class CommandIrisPregen extends MortarCommand
}
return true;
} else
}
else if(args[0].equalsIgnoreCase("resume"))
{
if(PregenJob.isPaused()){
sender.sendMessage("Pregen Resumed");
}
else
{
sender.sendMessage("No paused pregens. Use /ir pregen pause to pause.");
}
}
else
if(sender.isPlayer())
{
@ -102,7 +113,6 @@ public class CommandIrisPregen extends MortarCommand
{
sender.sendMessage("Players only.");
}
return true;
}

View File

@ -13,7 +13,7 @@ public class CommandIrisStructureExpand extends MortarCommand
{
public CommandIrisStructureExpand()
{
super("expand", "+++");
super("expand", "++");
requiresPermission(Iris.perm);
setCategory("Structure");
setDescription("Expand out more of the structure");

View File

@ -13,7 +13,7 @@ public class CommandIrisStructureMove extends MortarCommand
{
public CommandIrisStructureMove()
{
super("move", "++");
super("move", "here");
requiresPermission(Iris.perm);
setCategory("Structure");
setDescription("Load more of the structure");

View File

@ -11,7 +11,7 @@ public class CommandIrisStudioCreate extends MortarCommand
{
public CommandIrisStudioCreate()
{
super("create", "new");
super("create", "new", "+");
requiresPermission(Iris.perm.studio);
setDescription("Create a new project & open it.");
setCategory("Studio");