fix ticket-0704

Author: g5bot

src/Component/Spacecraft/System/Type/TractorBeamShipSystem.php

@@ -99,9 +99,9 @@ public function deactivate(SpacecraftWrapperInterface $wrapper): void
         if ($tractoredShip !== null) {
 
             $spacecraft->setTractoredShip(null);
-            $tractoredShip->setTractoringSpacecraft(null);
             $this->spacecraftRepository->save($spacecraft);
             $this->entityManager->flush();
+            $this->entityManager->refresh($spacecraft);
 
             $this->privateMessageSender->send(
                 $spacecraft->getUser()->getId(),

src/Migrations/pgsql/Version20250304213810_Field_Type_Complementary_Color.php

@@ -12,7 +12,7 @@ final class Version20250304213810_Field_Type_Complementary_Color extends Abstrac
 {
     public function getDescription(): string
     {
-        return 'Adds complementary color to field types';;
+        return 'Adds complementary color to field types';
     }
 
     public function up(Schema $schema): void

src/Migrations/pgsql/Version20250314102615_Clear_Faulty_Tractor_Reference.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stu\Migrations\Pgsql;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+
+final class Version20250314102615_Clear_Faulty_Tractor_Reference extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Clears the tractored ship reference, if the corresponding ship system is offline.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE stu_spacecraft s SET tractored_ship_id = NULL WHERE s.tractored_ship_id IS NOT NULL AND EXISTS (SELECT * FROM stu_spacecraft_system ss WHERE ss.spacecraft_id = s.id AND ss.system_type = 14 AND ss.mode < 2)');
+    }
+}

src/html/spacecraft/control/control_right.twig

@@ -193,40 +193,42 @@
     {% endif %}
 </table>
 {% endif %}
-{% if SPACECRAFT.isTractoring or SPACECRAFT.isTractored %}
+{% set tractoredShip = SPACECRAFT.getTractoredShip %}
+{% set tractoringSpacecraft = SPACECRAFT.getTractoringSpacecraft %}
+{% if tractoredShip or tractoringSpacecraft %}
 <table class="tcal">
     <tr>
         <th colspan="2"><img src="/assets/buttons/trak.png" title="Traktorstrahl" />
             Traktorstrahl</th>
     </tr>
     <tr>
-        {% if SPACECRAFT.isTractoring %}
+        {% if tractoredShip %}
         <td colspan="2">
-            Gerichtet auf: {{ SPACECRAFT.getTractoredShip.getName|bbcode }}
+            Gerichtet auf: {{ tractoredShip.getName|bbcode }}
         </td>
         {% else %}
         <td colspan="2">
-            Gehalten von: {{ SPACECRAFT.getTractoringSpacecraft.getName|bbcode }}
+            Gehalten von: {{ tractoringSpacecraft.getName|bbcode }}
         </td>
         {% endif %}
     </tr>
     <tr>
         <td>
-            {% if SPACECRAFT.isTractoring %}
-            {% if SPACECRAFT.isStation and not SPACECRAFT.getTractoredShip.isDestroyed %}
+            {% if tractoredShip %}
+            {% if SPACECRAFT.isStation %}
             <a href="javascript:void(0);"
                 onClick="actionToInnerContent('B_DOCK_TRACTORED', 'id={{ spacecraftId }}&sstr={{ SESSIONSTRING }}');"
                 onmouseover="cp('docktractored','buttons/dock2')" onmouseout="cp('docktractored','buttons/dock1')">
                 <img src="/assets/buttons/dock1.png" name="docktractored" title="Gehaltenes Schiff andocken" />
             </a>
             {% endif %}
-            <img src="/assets/ships/{{ SPACECRAFT.getTractoredShip.getRump.getId }}.png" />
+            <img src="/assets/ships/{{ tractoredShip.getRump.getId }}.png" />
             {% else %}
-            <img src="/assets/ships/{{ SPACECRAFT.getTractoringSpacecraft.getRump.getId }}.png" />
+            <img src="/assets/ships/{{ tractoringSpacecraft.getRump.getId }}.png" />
             {% endif %}
         </td>
         <td>
-            {% if SPACECRAFT.isTractoring %}
+            {% if tractoredShip %}
             <input type="submit" class="button" name="B_DEACTIVATE_TRACTOR" value="deaktivieren" />
             {% elseif SPACECRAFT.isDeflectorHealthy %}
             <input type="submit" class="button" name="B_ESCAPE_TRAKTOR" value="Fluchtversuch" />

testdata/Migrations/VersionTestBuildplansModules.php

@@ -41,7 +41,7 @@ public function up(Schema $schema): void
                        (22226, 689,6,11904,NULL,3);
                        (22227, 689,8,10835,NULL,3);
                        (22228, 689,10,10604,NULL,3);
-                       (22229, 689,7,10735,NULL,3);;
+                       (22229, 689,7,10735,NULL,3);
         ');
     }
 }