Ticket #4010: wondervictorymessagesfix.patch

binaries/data/mods/public/maps/scripts/WonderVictory.js

@@ -28 +28 @@
     // Add -1 to notify observers too
     var players = [-1];
     for (var i = 1; i < numPlayers; i++)
+    {
+        var playerEntityId = cmpPlayerManager.GetPlayerByID(i);
+        let cmpPlayer = Engine.QueryInterface(playerEntityId, IID_Player);
+        if (cmpPlayer.GetState() == "won")
+            return;
         if (i != data.to)
             players.push(i);
+    }
 
     var time = cmpWonder.GetVictoryDuration();
     messages.otherMessage = cmpGuiInterface.AddTimeNotification({

binaries/data/mods/public/simulation/components/EndGameManager.js

@@ -51 +51 @@
 EndGameManager.prototype.MarkPlayerAsWon = function(playerID)
 {
     var cmpPlayerManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_PlayerManager);
+    var cmpGuiInterface = Engine.QueryInterface(SYSTEM_ENTITY, IID_GuiInterface);
+    var messages = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger).wonderVictoryMessages;
+
+    for (let message in messages)
+    {
+        cmpGuiInterface.DeleteTimeNotification(messages[message].otherMessage);
+        cmpGuiInterface.DeleteTimeNotification(messages[message].ownMessage);
+    }
+
     var numPlayers = cmpPlayerManager.GetNumPlayers();
     for (var i = 1; i < numPlayers; i++)
     {