POM version correction, allowing stop to be used ingame, fixing AIOOD…

…E when using /warp
FallenMoonNetwork · Sep 2, 2013 · 47cf97c · 47cf97c
1 parent e09d37f
commit 47cf97c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <groupId>net.canarymod</groupId>
   <artifactId>CanaryLib</artifactId>
   <packaging>jar</packaging>
-  <version>1.0-RC-1</version>
+  <version>1.0-RC-2-SNAPSHOT</version>
   <name>CanaryLib</name>
   <url>http://www.canarymod.net</url>
   <inceptionYear>2012</inceptionYear>

diff --git a/src/main/java/net/canarymod/commandsys/CommandList.java b/src/main/java/net/canarymod/commandsys/CommandList.java
@@ -703,6 +703,7 @@ public void setSpawnCommand(MessageReceiver caller, String[] parameters) {
             description = "warp info",
             permissions = { "canary.command.warp.use" },
             toolTip = "/warp <name>",
+            min = 2,
             max = 2)
     public void warpUse(MessageReceiver caller, String[] parameters) {
         natives.get("warp").execute(caller, parameters);
@@ -746,7 +747,7 @@ public void spawnCommand(MessageReceiver caller, String[] parameters) {
 
     @Command(aliases = { "stop", "shutdown" },
             description = "stop info",
-            permissions = { "*" },
+            permissions = { "canary.super.command.stop" },
             toolTip = "/stop")
     public void stopCommand(MessageReceiver caller, String[] parameters) {
         natives.get("stop").execute(caller, parameters);

diff --git a/src/main/java/net/canarymod/commandsys/commands/StopServer.java b/src/main/java/net/canarymod/commandsys/commands/StopServer.java
@@ -1,5 +1,6 @@
 package net.canarymod.commandsys.commands;
 
+import net.canarymod.Canary;
 import net.canarymod.Translator;
 import net.canarymod.api.Server;
 import net.canarymod.api.entity.living.humanoid.Player;
@@ -15,7 +16,8 @@ public void execute(MessageReceiver caller, String[] parameters) {
             ((Server) caller).initiateShutdown();
         }
         else if (caller instanceof Player) {
-            caller.notice(Translator.translate("stop player"));
+            Canary.getServer().notice(Translator.translateAndFormat("stop console", caller.getName()));
+            Canary.getServer().initiateShutdown();
         }
         else {
             throw new CommandException("Unknown MessageReceiver: " + caller.getClass().getSimpleName());