From 0e376456e88a609b9623fe0f471ca8fe14db3028 Mon Sep 17 00:00:00 2001
From: Lixfel <agga-games@gmx.de>
Date: Thu, 21 Jul 2022 11:31:53 +0200
Subject: [PATCH] Potential tp fix, added link descriptor, MWG 1.19 build
 servers

Signed-off-by: Lixfel <agga-games@gmx.de>
---
 src/de/steamwar/bungeecore/commands/BauCommand.java | 10 +++++-----
 src/de/steamwar/bungeecore/util/Chat19.java         |  5 +----
 src/de/steamwar/messages/BungeeCore.properties      |  2 +-
 src/de/steamwar/messages/BungeeCore_de.properties   |  2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/de/steamwar/bungeecore/commands/BauCommand.java b/src/de/steamwar/bungeecore/commands/BauCommand.java
index ee6181a..aebf76a 100644
--- a/src/de/steamwar/bungeecore/commands/BauCommand.java
+++ b/src/de/steamwar/bungeecore/commands/BauCommand.java
@@ -139,7 +139,9 @@ public class BauCommand extends BasicCommand {
     private static void versionSelector(ProxiedPlayer p, String[] args, int pos, Runnable run19, Runnable run15, Runnable run12, Runnable runElse) {
         if(args.length <= pos) {
             int version = p.getPendingConnection().getVersion();
-            if(version > 340) { // Version > 1.12.2
+            if(version > 578) { // Version > 1.15.2
+                run19.run();
+            } else if(version > 340) { // Version > 1.12.2
                 run15.run();
             } else {
                 run12.run();
@@ -150,16 +152,14 @@ public class BauCommand extends BasicCommand {
         switch (args[pos].toLowerCase()) {
             case "19":
             case "1.19":
-            case "18":
-            case "1.18":
+            case "mwg":
+            case "miniwargear":
                 run19.run();
                 break;
             case "ws":
             case "warship":
             case "as":
             case "airship":
-            case "mwg":
-            case "miniwargear":
             case "wg":
             case "wargear":
             case "15":
diff --git a/src/de/steamwar/bungeecore/util/Chat19.java b/src/de/steamwar/bungeecore/util/Chat19.java
index 1110355..ab4e792 100644
--- a/src/de/steamwar/bungeecore/util/Chat19.java
+++ b/src/de/steamwar/bungeecore/util/Chat19.java
@@ -27,8 +27,6 @@ import net.md_5.bungee.protocol.PacketWrapper;
 import net.md_5.bungee.protocol.ProtocolConstants;
 import net.md_5.bungee.protocol.packet.Chat;
 
-import java.time.Instant;
-
 public class Chat19 extends Chat {
 
     public static void chat(ProxiedPlayer p, String message) {
@@ -44,7 +42,6 @@ public class Chat19 extends Chat {
         }
     }
 
-    private final Instant timestamp = Instant.now();
     private final long salt = 0L;
     private final byte[] signature = new byte[0];
     private final boolean signedPreview = false;
@@ -59,7 +56,7 @@ public class Chat19 extends Chat {
             throw new UnsupportedOperationException();
 
         writeString(getMessage(), buf);
-        buf.writeLong(timestamp.toEpochMilli());
+        buf.writeLong(System.currentTimeMillis());
         buf.writeLong(salt);
         writeArray(signature, buf);
         buf.writeBoolean(signedPreview);
diff --git a/src/de/steamwar/messages/BungeeCore.properties b/src/de/steamwar/messages/BungeeCore.properties
index 58633d2..203618f 100644
--- a/src/de/steamwar/messages/BungeeCore.properties
+++ b/src/de/steamwar/messages/BungeeCore.properties
@@ -20,7 +20,7 @@ DISABLED=§cCurrently disabled.
 
 #ModLoader blocker
 MODLOADER_INSTALLED=§7You play with §e{0} §7client. Therefore you can't join arenas.
-MODLOADER_INSTALLED_FABRIC=§7You play with §e{0} §7client. You can only join arenas with the SteamWar Modsender installed.
+MODLOADER_INSTALLED_FABRIC=§7You play with §e{0} §7client. You can join arenas only with the FabricModSender https://steamwar.de/downloads installed.
 MODLOADER_DENIED=§cYou cannot join arenas with Fabric and LiteLoader.
 
 #Help command
diff --git a/src/de/steamwar/messages/BungeeCore_de.properties b/src/de/steamwar/messages/BungeeCore_de.properties
index 0c93d45..28df9b1 100644
--- a/src/de/steamwar/messages/BungeeCore_de.properties
+++ b/src/de/steamwar/messages/BungeeCore_de.properties
@@ -16,7 +16,7 @@ DISABLED=§cDerzeit deaktiviert.
 
 #ModLoader blocker
 MODLOADER_INSTALLED=§7Du spielst mit §e{0} §7Client. Daher kannst du keinen Arenen beitreten.
-MODLOADER_INSTALLED_FABRIC=§7Du spielst mit §e{0} §7Client. Nur mit dem SteamWarModSender kannst du Arenen beitreten.
+MODLOADER_INSTALLED_FABRIC=§7Du spielst mit §e{0} §7Client. Nur mit dem FabricModSender https://steamwar.de/downloads kannst du Arenen beitreten.
 MODLOADER_DENIED=§cMit Fabric und LiteLoader kannst du keinen Arenen beitreten.
 
 #Help command