Fix spectators and commands with /t

.dev/config.json

@@ -0,0 +1,21 @@
+{
+  "hubIp": "localhost",
+  "hubPort": 6567,
+  "sockPort": 8306,
+  "mongoUrl": "mongodb://localhost",
+  "pluginSource": "path",
+  "maxUnitsTotal": -1,
+  "allowSpecialSettings": false,
+  "overrideMonoAi": false,
+  "maxBackupCount": 2,
+  "backupDelaySec": 300,
+  "overridePort": -1,
+  "whitelist":{
+    "items": [],
+    "size": 0,
+    "ordered": true
+  },
+  "whitelistKickSpectator": false,
+  "serverId": -1,
+  "mode": "survival"
+}

.dev/docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3.8'
+
+services:
+  mongo:
+    image: mongo:6.0
+    container_name: mongo_dev
+    ports:
+      - "27017:27017"
+    volumes:
+      - mongo_data:/data/db
+    environment:
+      MONGO_INITDB_DATABASE: myapp_db
+
+volumes:
+  mongo_data:

.gitignore

@@ -13,3 +13,5 @@
 /server/
 kls_database.db
 .factorypath
+config
+server-release.jar

src/main/java/darkdustry/commands/ModCommandHandler.java

@@ -18,6 +18,9 @@ public ModCommandHandler(CommandHandler proxied) {
 
     @Override
     public CommandResponse handleMessage(String message, Object params) {
+        if (message.toLowerCase().startsWith("/t /")) {
+            message = message.substring(3);
+        }
         if (message.contains(" ")) {
             message = message.substring(0, message.indexOf(" ")).toLowerCase() + message.substring(message.indexOf(" "));
         }

src/main/java/darkdustry/features/Spectate.java

@@ -55,15 +55,15 @@ public static void init() {
         });
 
         Events.on(EventType.BlockBuildBeginEvent.class, event -> {
-            var player = event.unit.getPlayer();
-            if (player == null) return;
-            tracker(player).pause();
+            var unit = event.unit.getPlayer();
+            if (unit == null) return;
+            tracker(unit).pause();
         });
 
         Events.on(EventType.BlockBuildEndEvent.class, event -> {
-            var player = event.unit.getPlayer();
-            if (player == null) return;
-            tracker(player).reset();
+            var unit = event.unit.getPlayer();
+            if (unit == null) return;
+            tracker(unit).reset();
         });
 
         Events.on(EventType.PlayerChatEvent.class, event -> tracker(event.player).tick = 0);

src/main/java/darkdustry/listeners/PluginEvents.java

@@ -89,7 +89,9 @@ public static void load() {
             }
         });
 
-        Events.on(WaveEvent.class, event -> Groups.player.each(player -> Cache.get(player).wavesSurvived++));
+        Events.on(WaveEvent.class, event -> Groups.player.each(player -> {
+            if (!Spectate.isSpectator(player)) Cache.get(player).wavesSurvived++;
+        }));
 
         Events.on(WorldLoadEvent.class, event -> History.reset());
 
@@ -163,10 +165,6 @@ public static void load() {
             Alerts.buildAlert(event);
         });
 
-        Events.on(BlockDestroyEvent.class, event -> {
-            if (!(event.tile.build instanceof CoreBlock.CoreBuild)) return;
-        });
-
         Events.on(GeneratorPressureExplodeEvent.class, event -> app.post(() -> {
             if (!Units.canCreate(event.build.team, UnitTypes.latum)) return;
 
@@ -327,9 +325,10 @@ else if (data.discordLink)
 
             Groups.player.each(player -> {
                 var data = Cache.get(player);
-                data.gamesPlayed++;
-
-                if (player.team() == event.winner)
+                if (!Spectate.isSpectator(player)) {
+                    data.gamesPlayed++;
+                }
+                if (player.team() == event.winner && !Spectate.isSpectator(player))
                     switch (config.mode) {
                         case attack -> data.attackWins++;
                         case castle -> data.castleWins++;
@@ -405,7 +404,9 @@ else if (data.discordLink)
         // Таймер обновления времени игры и рангов
         Timer.schedule(() -> Groups.player.each(player -> {
             var data = Cache.get(player);
-            data.playTime++;
+            if (!Spectate.isSpectator(player)) {
+                data.playTime++;
+            }
 
             while (data.rank.checkNext(data.playTime, data.blocksPlaced, data.gamesPlayed, data.wavesSurvived, data.fortsOvas)) {
                 data.rank = data.rank.next;

src/main/resources/bundles/bundle_en.properties

@@ -327,7 +327,7 @@ kick.vpn = [scarlet]VPN services are forbidden on this server.\n\n[accent]If you
 kick.kicked-by-admin = [scarlet]You have been kicked from Mindurka.\n[scarlet]Administrator: [orange]{0}
 kick.banned-by-admin = [scarlet]You have been banned from Mindurka.\n[scarlet]Administrator: [orange]{0}
 
-kick.hotspot = [scarlet]Your IP has been graylisted. To connect to the server, please link your profile to a Discord account by typing [blue]/discord-link[] in hub. [lightgray](IP: mindurka.fun)
+kick.hotspot = [scarlet]Your IP has been graylisted. To connect to the server, please link your profile to a Discord account by typing [blue]/discord-link[] in hub. [lightgray](IP: mindurka.online)
 # endregion
 
 # RANKS