Skip to content

Commit

Permalink
Merge pull request #220 from InvalidArgument3/live-server-triage
Browse files Browse the repository at this point in the history 
better merged zone handling; client server sync debug
  • Loading branch information
@InvalidArgument3
InvalidArgument3 authored Oct 29, 2024
2 parents 25fe662 + ea6675c commit 0c16c5f
Show file tree
Hide file tree
Showing 2 changed files with 108 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dynamic Asteroids/Data/Scripts/DynamicAsteroids/AsteroidNetworkPackets.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ public static void SendAsteroidUpdate(AsteroidEntity asteroid) {
}

public static void SendAsteroidRemoval(long entityId) {
Log.Info($"Broadcasting asteroid removal: {entityId}");
var packet = new AsteroidRemovalPacket { EntityId = entityId };

byte[] data = MyAPIGateway.Utilities.SerializeToBinary(packet);
MyAPIGateway.Multiplayer.SendMessageToOthers(32000, data);
}
Expand Down
121 changes: 107 additions & 14 deletions Dynamic Asteroids/Data/Scripts/DynamicAsteroids/AsteroidSpawner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class AsteroidZone {
public int AsteroidCount { get; set; }
public bool IsMerged { get; set; }
public long EntityId { get; set; }
public HashSet<long> ContainedAsteroids { get; private set; }
public HashSet<long> ContainedAsteroids { get; set; }
public bool IsMarkedForRemoval { get; set; }
public DateTime LastActiveTime { get; set; }
public double CurrentSpeed { get; set; } // Add this property
Expand Down Expand Up @@ -262,6 +262,9 @@ public AsteroidSpawner(RealGasGiantsApi realGasGiantsApi) {
_networkManager = new ZoneNetworkManager();
}

public bool IsAsteroidTracked(long entityId) {
return _asteroids.Any(a => a.EntityId == entityId);
}

public void Init(int seed) {
if (!MyAPIGateway.Session.IsServer) return;
Expand Down Expand Up @@ -532,24 +535,66 @@ private AsteroidZone FindAlternateZone(Vector3D position, AsteroidZone excludeZo
#region Zone Updates
public void MergeZones() {
List<AsteroidZone> mergedZones = new List<AsteroidZone>();

foreach (AsteroidZone zone in playerZones.Values) {
bool merged = false;
foreach (AsteroidZone mergedZone in mergedZones) {
double distance = Vector3D.Distance(zone.Center, mergedZone.Center);
double combinedRadius = zone.Radius + mergedZone.Radius;
if (!(distance <= combinedRadius)) continue;
Vector3D newCenter = (zone.Center + mergedZone.Center) / 2;
double newRadius = Math.Max(zone.Radius, mergedZone.Radius) + distance / 2;
mergedZone.Center = newCenter;
mergedZone.Radius = newRadius;
mergedZone.AsteroidCount += zone.AsteroidCount;
merged = true;
break;

Log.Info($"Checking zones for merge:" +
$"\nZone 1: Center={zone.Center}, Radius={zone.Radius}" +
$"\nZone 2: Center={mergedZone.Center}, Radius={mergedZone.Radius}" +
$"\nDistance={distance}, Combined Radius={combinedRadius}" +
$"\nOverlapping={distance <= combinedRadius}");

if (distance <= combinedRadius) {
Vector3D newCenter = (zone.Center + mergedZone.Center) / 2;
double newRadius = Math.Max(zone.Radius, mergedZone.Radius) + distance / 2;

// Combine asteroid sets
var combinedAsteroids = new HashSet<long>(mergedZone.ContainedAsteroids);
combinedAsteroids.UnionWith(zone.ContainedAsteroids);

// Update merged zone
mergedZone.Center = newCenter;
mergedZone.Radius = newRadius;
mergedZone.ContainedAsteroids = combinedAsteroids;
mergedZone.AsteroidCount = combinedAsteroids.Count;

// Enforce per-zone limit even for merged zones
if (mergedZone.AsteroidCount > AsteroidSettings.MaxAsteroidsPerZone) {
Log.Info($"Merged zone exceeds asteroid limit ({mergedZone.AsteroidCount}/{AsteroidSettings.MaxAsteroidsPerZone}), cleaning up excess");

// Remove excess asteroids
var asteroidsToRemove = mergedZone.ContainedAsteroids
.Skip(AsteroidSettings.MaxAsteroidsPerZone)
.ToList();

foreach (var asteroidId in asteroidsToRemove) {
mergedZone.ContainedAsteroids.Remove(asteroidId);
var asteroid = MyEntities.GetEntityById(asteroidId) as AsteroidEntity;
if (asteroid != null) {
RemoveAsteroid(asteroid);
}
}

mergedZone.AsteroidCount = AsteroidSettings.MaxAsteroidsPerZone;
}

merged = true;
break;
}
}

if (!merged) {
mergedZones.Add(new AsteroidZone(zone.Center, zone.Radius) { AsteroidCount = zone.AsteroidCount });
mergedZones.Add(new AsteroidZone(zone.Center, zone.Radius) {
AsteroidCount = zone.AsteroidCount,
ContainedAsteroids = new HashSet<long>(zone.ContainedAsteroids)
});
}
}

AssignMergedZonesToPlayers(mergedZones);
}
public void UpdateZones() {
Expand Down Expand Up @@ -691,8 +736,7 @@ public void SendZoneUpdates() {
private Dictionary<long, Vector3D> _lastZonePositions = new Dictionary<long, Vector3D>();
private bool HaveZonesChanged() {
bool changed = false;
foreach (var zone in playerZones.Values)
{
foreach (var zone in playerZones.Values) {
Vector3D lastPos;
if (!_lastZonePositions.TryGetValue(zone.EntityId, out lastPos) ||
Vector3D.DistanceSquared(lastPos, zone.Center) > 1) {
Expand Down Expand Up @@ -972,21 +1016,26 @@ private bool IsValidSpawnPosition(Vector3D position, List<AsteroidZone> zones) {
private void CleanupOrphanedAsteroids() {
if (_isCleanupRunning) return;
_isCleanupRunning = true;

try {
var currentZones = playerZones.Values.ToList();
var asteroidsToRemove = new List<AsteroidEntity>();
var trackedAsteroids = _asteroids.ToList();

Log.Info($"Starting orphaned asteroid cleanup. Tracked asteroids: {trackedAsteroids.Count}");

foreach (var asteroid in trackedAsteroids) {
if (asteroid == null || asteroid.MarkedForClose) continue;

Vector3D asteroidPosition = asteroid.PositionComp.GetPosition();
bool isInAnyZone = false;

foreach (var zone in currentZones) {
if (zone.IsPointInZone(asteroidPosition)) {
isInAnyZone = true;
// Verify zone tracking
if (!zone.ContainedAsteroids.Contains(asteroid.EntityId)) {
Log.Warning($"Asteroid {asteroid.EntityId} in zone but not tracked by it!");
zone.ContainedAsteroids.Add(asteroid.EntityId);
}
break;
}
}
Expand All @@ -1004,6 +1053,21 @@ private void CleanupOrphanedAsteroids() {
}
}

// Verify all zone-tracked asteroids exist
foreach (var zone in currentZones) {
var missingAsteroids = zone.ContainedAsteroids
.Where(id => !IsAsteroidTracked(id))
.ToList();

if (missingAsteroids.Any()) {
Log.Warning($"Zone has {missingAsteroids.Count} tracked asteroids that don't exist!");
foreach (var id in missingAsteroids) {
zone.ContainedAsteroids.Remove(id);
zone.AsteroidCount = Math.Max(0, zone.AsteroidCount - 1);
}
}
}

_lastCleanupTime = DateTime.UtcNow;
}
catch (Exception ex) {
Expand All @@ -1014,6 +1078,7 @@ private void CleanupOrphanedAsteroids() {
}
}


#endregion

#region Main Update and Cleanup Cycle
Expand Down Expand Up @@ -1089,6 +1154,11 @@ public void UpdateTick() {
}
}

// Add this every X ticks
if (_updateIntervalTimer % 600 == 0) { // Every 10 seconds
VerifyServerClientSync();
}

ProcessPendingRemovals();
}
catch (Exception ex) {
Expand Down Expand Up @@ -1436,6 +1506,29 @@ private void ValidateAsteroidTracking() {
}
}

private void VerifyServerClientSync() {
Log.Info("Verifying server-client sync state:");
Log.Info($"Total tracked asteroids: {_asteroids.Count}");

foreach (var zone in playerZones.Values) {
var missingFromTracking = zone.ContainedAsteroids
.Where(id => !IsAsteroidTracked(id))
.ToList();

if (missingFromTracking.Any()) {
Log.Warning($"Zone has {missingFromTracking.Count} asteroids not in server tracking!");
foreach (var id in missingFromTracking) {
zone.ContainedAsteroids.Remove(id);
zone.AsteroidCount = Math.Max(0, zone.AsteroidCount - 1);
}
}

Log.Info($"Zone at {zone.Center}:" +
$"\n - Tracked asteroids: {zone.ContainedAsteroids.Count}" +
$"\n - Asteroid count: {zone.AsteroidCount}" +
$"\n - Missing from tracking: {missingFromTracking.Count}");
}
}

}
}

0 comments on commit 0c16c5f

Please sign in to comment.