Merge branch 'master' into replaying

src/de/steamwar/bungeecore/commands/CheckCommand.java

@@ -69,7 +69,7 @@ public class CheckCommand extends BasicCommand {
     public static void sendReminder(ProxiedPlayer player) {
         List<SchematicNode> schematics = getSchemsToCheck();
         if(schematics.size() != currentCheckers.size())
-            Message.send("CHECK_REMINDER", player, "CHECK_REMINDER_HOVER", new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/check list"), schematics.size() - currentCheckers.size());
+            Message.send("CHECK_REMINDER", player, Message.parse("CHECK_REMINDER_HOVER", player), new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/check list"), schematics.size() - currentCheckers.size());
     }
 
     @Override

src/de/steamwar/bungeecore/listeners/TablistManager.java

@@ -317,7 +317,7 @@ public class TablistManager extends BasicListener {
                 if(slim && !displaySlim(viewer.player, player.player))
                     continue;
 
-                int ping = sameServer ? 1 : 500;
+                int ping = sameServer ? 1 : 1000;
                 String name = player.defaultName.startsWith("§7") && user.getTeam() != 0 && user.getTeam() == SteamwarUser.get(player.player.getUniqueId()).getTeam() ? "§f" + player.player.getName() : player.defaultName;
                 viewer.setSlot(BungeeTabListPlusAPI.getIconFromPlayer(player.player), name, ping);
             }