developer/galaxy-game
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: remove fleet when deleting last group

Browse Source
This commit is contained in:
IliaDenisov
2026-02-10 21:14:15 +03:00
parent 56998d4c2d
commit 43dc8ab3f9
7 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/fleet.go
+4 -4
View File
@@ -140,7 +140,7 @@ func (c *Cache) ShipGroupJoinFleet(ri int, fleetName string, groupID uuid.UUID,
}
if quantity > 0 && quantity < c.ShipGroup(sgi).Number {
nsgi, err := c.breakGroupSafe(ri, groupID, quantity)
nsgi, err := c.breakGroup(ri, groupID, quantity)
if err != nil {
return err
}
@@ -162,7 +162,7 @@ func (c *Cache) ShipGroupJoinFleet(ri int, fleetName string, groupID uuid.UUID,
if !ok {
return e.NewGameStateError("old fleet index not found by ID=%v", *oldFleetID)
}
if err := c.deleteFleetSafe(ri, c.g.Fleets[oldFleetIndex].Name); err != nil {
if err := c.deleteFleet(ri, c.g.Fleets[oldFleetIndex].Name); err != nil {
return err
}
}
@@ -191,7 +191,7 @@ func (c *Cache) fleetMerge(ri int, fleetSourceName, fleetTargetName string) (err
sg.FleetID = &c.g.Fleets[fiTarget].ID
}
}
return c.deleteFleetSafe(ri, fleetSourceName)
return c.deleteFleet(ri, fleetSourceName)
}
func (c *Cache) createFleet(ri int, name string) (int, error) {
@@ -217,7 +217,7 @@ func (c *Cache) createFleet(ri int, name string) (int, error) {
return i, nil
}
func (c *Cache) deleteFleetSafe(ri int, name string) error {
func (c *Cache) deleteFleet(ri int, name string) error {
fi, ok := c.fleetIndex(ri, name)
if !ok {
return e.NewEntityNotExistsError("fleet %s", name)