Move TotalDamageCondition into _DV along with some other fixes

This commit is contained in:
Coryler
2026-06-29 12:44:07 +02:00
parent 5e7c4ec6e0
commit e1231ab140
39 changed files with 159 additions and 963 deletions
@@ -59,11 +59,14 @@ public sealed class AdminNotesSystem : EntitySystem
if (note.NoteType != NoteType.Watchlist)
return;
var notes = _connectedPlayerWatchlists.GetOrNew(note.Player);
notes.Add(note);
foreach (var player in note.Players)
{
var notes = _connectedPlayerWatchlists.GetOrNew(player);
notes.Add(note);
if (_playerManager.TryGetSessionById(note.Player, out var session))
_admin.UpdatePlayerList(session);
if (_playerManager.TryGetSessionById(player, out var session))
_admin.UpdatePlayerList(session);
}
}
private void OnNoteModified(SharedAdminNote note)
@@ -71,12 +74,15 @@ public sealed class AdminNotesSystem : EntitySystem
if (note.NoteType != NoteType.Watchlist)
return;
var modifiedIndex = _connectedPlayerWatchlists[note.Player].FindIndex(n => n.Id == note.Id);
if (modifiedIndex != -1)
_connectedPlayerWatchlists[note.Player][modifiedIndex] = note;
foreach (var player in note.Players)
{
var modifiedIndex = _connectedPlayerWatchlists[player].FindIndex(n => n.Id == note.Id);
if (modifiedIndex != -1)
_connectedPlayerWatchlists[player][modifiedIndex] = note;
if (_playerManager.TryGetSessionById(note.Player, out var session))
_admin.UpdatePlayerList(session);
if (_playerManager.TryGetSessionById(player, out var session))
_admin.UpdatePlayerList(session);
}
}
private void OnNoteDeleted(SharedAdminNote note)
@@ -84,15 +90,18 @@ public sealed class AdminNotesSystem : EntitySystem
if (note.NoteType != NoteType.Watchlist)
return;
var deletedIndex = _connectedPlayerWatchlists[note.Player].FindIndex(n => n.Id == note.Id);
if (deletedIndex != -1)
_connectedPlayerWatchlists[note.Player].RemoveAt(deletedIndex);
foreach (var player in note.Players)
{
var deletedIndex = _connectedPlayerWatchlists[player].FindIndex(n => n.Id == note.Id);
if (deletedIndex != -1)
_connectedPlayerWatchlists[player].RemoveAt(deletedIndex);
if (_connectedPlayerWatchlists[note.Player].Count == 0)
_connectedPlayerWatchlists.Remove(note.Player);
if (_connectedPlayerWatchlists[player].Count == 0)
_connectedPlayerWatchlists.Remove(player);
if (_playerManager.TryGetSessionById(note.Player, out var session))
_admin.UpdatePlayerList(session);
if (_playerManager.TryGetSessionById(player, out var session))
_admin.UpdatePlayerList(session);
}
}
// DeltaV - track watchlist changes END