etc/SmoOnlineServer
0
0
Fork 0
mirror of https://github.com/Sanae6/SmoOnlineServer.git synced 2024-11-22 03:05:16 +00:00
Code Issues Projects Releases Wiki Activity

new setting: Shines/Excluded

Browse source 
To exclude specific shines to be synced to other clients.

Pre-initialized with shine 496 (Moon Shards in the Sand) that causes people to get stuck in front of the inverted pyramid.

This commit fixes issue #31
This commit is contained in:
Robin C. Ladiges 2024-04-25 02:09:25 +02:00 committed by Sanae
parent 20ee74d0d6
commit 61e6fcf2a3
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Server/Program.cs
View file

@ -74,7 +74,7 @@ async Task ClientSyncShineBag(Client client) {
try { try {
if ((bool?) client.Metadata["speedrun"] ?? false) return; if ((bool?) client.Metadata["speedrun"] ?? false) return;
ConcurrentBag<int> clientBag = (ConcurrentBag<int>) (client.Metadata["shineSync"] ??= new ConcurrentBag<int>()); ConcurrentBag<int> clientBag = (ConcurrentBag<int>) (client.Metadata["shineSync"] ??= new ConcurrentBag<int>());
foreach (int shine in shineBag.Except(clientBag).ToArray()) { foreach (int shine in shineBag.Except(clientBag).Except(Settings.Instance.Shines.Excluded).ToArray()) {
if (!client.Connected) return; if (!client.Connected) return;
await client.Send(new ShinePacket { await client.Send(new ShinePacket {
ShineId = shine ShineId = shine
@ -196,6 +196,10 @@ server.PacketHandler = (c, p) => {
case ShinePacket shinePacket: { case ShinePacket shinePacket: {
if (!Settings.Instance.Shines.Enabled) return false; if (!Settings.Instance.Shines.Enabled) return false;
if (Settings.Instance.Shines.Excluded.Contains(shinePacket.ShineId)) {
c.Logger.Info($"Got moon {shinePacket.ShineId} (excluded)");
return false;
}
if (c.Metadata["loadedSave"] is false) break; if (c.Metadata["loadedSave"] is false) break;
ConcurrentBag<int> playerBag = (ConcurrentBag<int>)c.Metadata["shineSync"]!; ConcurrentBag<int> playerBag = (ConcurrentBag<int>)c.Metadata["shineSync"]!;
shineBag.Add(shinePacket.ShineId); shineBag.Add(shinePacket.ShineId);
@ -558,12 +562,16 @@ CommandHandler.RegisterCommand("flip", args => {
}); });
CommandHandler.RegisterCommand("shine", args => { CommandHandler.RegisterCommand("shine", args => {
const string optionUsage = "Valid options: list, clear, sync, send, set"; const string optionUsage = "Valid options: list, clear, sync, send, set, include, exclude";
if (args.Length < 1) if (args.Length < 1)
return optionUsage; return optionUsage;
switch (args[0]) { switch (args[0]) {
case "list" when args.Length == 1: case "list" when args.Length == 1:
return $"Shines: {string.Join(", ", shineBag)}"; return $"Shines: {string.Join(", ", shineBag)}" + (
Settings.Instance.Shines.Excluded.Count() > 0
? "\nExcluded Shines: " + string.Join(", ", Settings.Instance.Shines.Excluded)
: ""
);
case "clear" when args.Length == 1: case "clear" when args.Length == 1:
shineBag.Clear(); shineBag.Clear();
Task.Run(async () => { Task.Run(async () => {
@ -600,6 +608,21 @@ CommandHandler.RegisterCommand("shine", args => {
return optionUsage; return optionUsage;
} }
case "exclude" when args.Length == 2:
case "include" when args.Length == 2: {
if (int.TryParse(args[1], out int sid)) {
if (args[0] == "exclude") {
Settings.Instance.Shines.Excluded.Add(sid);
Settings.SaveSettings();
return $"Exclude shine {sid} from syncing.";
} else {
Settings.Instance.Shines.Excluded.Remove(sid);
Settings.SaveSettings();
return $"No longer exclude shine {sid} from syncing.";
}
}
return optionUsage;
}
default: default:
return optionUsage; return optionUsage;
} }

1
Server/Settings.cs
View file

@ -80,6 +80,7 @@ public class Settings {
public class ShineTable { public class ShineTable {
public bool Enabled { get; set; } = true; public bool Enabled { get; set; } = true;
public ISet<int> Excluded { get; set; } = new SortedSet<int> { 496 };
} }
public class PersistShinesTable public class PersistShinesTable