Merge branch 'master' into spigot

This commit is contained in:
sekwah41 2018-02-02 10:33:12 +00:00
commit 5b12b4ccdb
2 changed files with 3 additions and 1 deletions

View File

@ -50,7 +50,7 @@ command.remove.noselection=You don't have a portal selected
command.selector= You have been given a portal selector. command.selector= You have been given a portal selector.
command.selector.help=Gives you a portal region selector command.selector.help=Gives you a portal region selector
command.selector.detailedhelp=Gives you a portal selector to select the regions for making portals. You can also use /portal command.selector.detailedhelp=Gives you a portal selector to select the regions for making portals.
portal.invalidselection=You must have both pos1 and pos2 selected to create a portal. portal.invalidselection=You must have both pos1 and pos2 selected to create a portal.
portal.noname=No name for the portal has been given. portal.noname=No name for the portal has been given.

View File

@ -122,6 +122,8 @@ public class AdvancedPortalsCore {
this.portalCommand.registerSubCommand("transupdate", new TransUpdateSubCommand(this)); this.portalCommand.registerSubCommand("transupdate", new TransUpdateSubCommand(this));
this.portalCommand.registerSubCommand("reload", new ReloadSubCommand(this)); this.portalCommand.registerSubCommand("reload", new ReloadSubCommand(this));
this.portalCommand.registerSubCommand("selector", new SelectorSubCommand(this), "wand"); this.portalCommand.registerSubCommand("selector", new SelectorSubCommand(this), "wand");
this.portalCommand.registerSubCommand("create", new CreateSubCommand());
this.portalCommand.registerSubCommand("remove", new RemoveSubCommand());
this.commandRegister.registerCommand("portal", this.portalCommand); this.commandRegister.registerCommand("portal", this.portalCommand);
} }