Merge branch 'master' into feat/dataset-loger-improvements

Scoppio · Scoppio · commit d0df60226f7f · 2025-04-07T18:50:27.000-03:00
diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt
@@ -29,7 +29,8 @@ MEGAMEK VERSION HISTORY:
 + Fix #6751: Princess will now deploy mines on her turn instead of at the start of the phase.
 + PR #6829: Expanded MathUtility Integer Parsing
 + PR #6832: Corrects custom armor calculation required for megameklab#1820 that fixes megameklab#1808: Conventional infantry custom armor not appearring on record sheet
-+ PR #6835 Fixed issue with Ammo Counts showing 0 when configuring from Lobby
++ PR #6835: Fixed issue with Ammo Counts showing 0 when configuring from Lobby
++ PR #6837: Removes broken event from server
 
 0.50.04 (2025-03-22 1600 UTC)
 + PR #6494: Cap splashscreen button width
diff --git a/megamek/src/megamek/ai/dataset/TabSeparatedValueSerializer.java b/megamek/src/megamek/ai/dataset/TabSeparatedValueSerializer.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitAction.java b/megamek/src/megamek/ai/dataset/UnitAction.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitActionField.java b/megamek/src/megamek/ai/dataset/UnitActionField.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitActionSerializer.java b/megamek/src/megamek/ai/dataset/UnitActionSerializer.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitAttackAction.java b/megamek/src/megamek/ai/dataset/UnitAttackAction.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitAttackField.java b/megamek/src/megamek/ai/dataset/UnitAttackField.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitAttackSerializer.java b/megamek/src/megamek/ai/dataset/UnitAttackSerializer.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitState.java b/megamek/src/megamek/ai/dataset/UnitState.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitStateField.java b/megamek/src/megamek/ai/dataset/UnitStateField.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/dataset/UnitStateSerializer.java b/megamek/src/megamek/ai/dataset/UnitStateSerializer.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/utility/EntityFeatureUtils.java b/megamek/src/megamek/ai/utility/EntityFeatureUtils.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,
diff --git a/megamek/src/megamek/ai/utility/Memory.java b/megamek/src/megamek/ai/utility/Memory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2024-2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
diff --git a/megamek/src/megamek/server/Server.java b/megamek/src/megamek/server/Server.java
@@ -50,16 +50,12 @@
 import megamek.Version;
 import megamek.client.ui.swing.util.PlayerColour;
 import megamek.codeUtilities.StringUtility;
-import megamek.common.Coords;
 import megamek.common.Game;
 import megamek.common.IGame;
 import megamek.common.Player;
 import megamek.common.Roll;
 import megamek.common.annotations.Nullable;
 import megamek.common.commandline.AbstractCommandLineParser.ParseException;
-import megamek.common.enums.GamePhase;
-import megamek.common.event.GameListenerAdapter;
-import megamek.common.event.GamePhaseChangeEvent;
 import megamek.common.icons.Camouflage;
 import megamek.common.net.connections.AbstractConnection;
 import megamek.common.net.enums.PacketCommand;
@@ -1369,80 +1365,6 @@ protected void handle(int connId, Packet packet) {
 
     private void wargamesResponse() {
         sendServerChat(WARGAMES_RESPONSE);
-        wargamesAttack(3, new Random().nextInt(5, 13));
-    }
-
-    private void wargamesAttack(int rounds, int numberOfStrikes) {
-        if (rounds <= 0) {
-            return;
-        }
-
-        if (this.getGame() != null && this.getGame().getBoard() != null) {
-            int height = this.getGame().getBoard().getHeight();
-            int width = this.getGame().getBoard().getWidth(); // Fixed width retrieval
-
-            Random random = new Random();
-            List<Coords> selectedCoords = new ArrayList<>();
-
-            int maxAttempts = 100;
-            int maxStrikes = rounds == 1 ? numberOfStrikes : new Random().nextInt(1, numberOfStrikes + 1);
-            for (int i = 0; i < maxStrikes; i++) {
-                Coords newCoord = null;
-
-                for (int attempt = 0; attempt < maxAttempts; attempt++) {
-                    int x = random.nextInt(width);
-                    int y = random.nextInt(height);
-                    Coords candidate = new Coords(x, y);
-
-                    boolean isValid = true;
-                    for (Coords coords : selectedCoords) {
-                        int dx = Math.abs(coords.getX() - x);
-                        int dy = Math.abs(coords.getY() - y);
-                        if (Math.max(dx, dy) <= 9) {
-                            isValid = false;
-                            break;
-                        }
-                    }
-
-                    if (isValid) {
-                        newCoord = candidate;
-                        break;
-                    }
-                }
-
-                if (newCoord != null) {
-                    selectedCoords.add(newCoord);
-                } else {
-                    break; // Stop if we can't find a valid coordinate
-                }
-            }
-
-            if (!selectedCoords.isEmpty()) {
-                sendServerChat("!!!WARNING!!! LAUNCH OF STRATEGIC WEAPONS DETECTED");
-                sendServerChat("!!!WARNING!!! LAUNCH OF STRATEGIC WEAPONS DETECTED");
-                sendServerChat("!!!WARNING!!! LAUNCH OF STRATEGIC WEAPONS DETECTED");
-            }
-
-            for (Coords coords : selectedCoords) {
-                numberOfStrikes--;
-                processCommand(SERVER_CONN, "/ob " + coords.getX() + 1 + " " + coords.getY() + 1);
-                sendServerChat("DANGER ZONE: Incoming strategic strike at " +
-                                     (coords.getX() + 1) +
-                                     ", " +
-                                     (coords.getY() + 1));
-            }
-        }
-
-        final int strikesRemaining = numberOfStrikes;
-        this.getGame().addGameListener(new GameListenerAdapter() {
-            @Override
-            public void gamePhaseChange(GamePhaseChangeEvent e) {
-                if (e.getNewPhase() == GamePhase.PREMOVEMENT) {
-                    wargamesAttack(rounds - 1, strikesRemaining);
-                    getGame().removeGameListener(this);
-                }
-            }
-        });
     }
 
     /**
diff --git a/megamek/unittests/megamek/common/EntityFeatureUtilsTest.java b/megamek/unittests/megamek/common/EntityFeatureUtilsTest.java
@@ -1,8 +1,9 @@
 /*
- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.
+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.
  *
  * This file is part of MegaMek.
  *
+ *
  * MegaMek is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License (GPL),
  * version 3 or (at your option) any later version,

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2017-2025 The MegaMek Team. All Rights Reserved.`
	`2`	`+ * Copyright (C) 2025 The MegaMek Team. All Rights Reserved.`
`3`	`3`	`*`
`4`	`4`	`* This file is part of MegaMek.`
`5`	`5`	`*`
	`6`	`+ *`
`6`	`7`	`* MegaMek is free software: you can redistribute it and/or modify`
`7`	`8`	`* it under the terms of the GNU General Public License (GPL),`
`8`	`9`	`* version 3 or (at your option) any later version,`