Merge master into 'move-convert-command'

2016-02-14 22:32:12 +01:00
parent 15792f01e9 f5b5595f08
commit ecc3048f52
46 changed files with 384 additions and 177 deletions
@@ -70,7 +70,7 @@ public class AsynchronousJoin {
                @Override
                public void run() {
                    AuthMePlayerListener.causeByAuthMe.putIfAbsent(name, true);
-                    player.kickPlayer("You are not the owner of this account. Please try another name!");
+                    player.kickPlayer(m.retrieveSingle(MessageKey.NOT_OWNER_ERROR));
                    if (Settings.banUnsafeIp)
                        plugin.getServer().banIP(ip);
                }