Moonbase/jsgr-mmo
1
0
Fork 0
forked from SoDOff-Project/sodoff-mmo
Code Pull Requests Activity

fix Public Message, add option to disable Events

Browse Source 
- Position info and Boxes on races works (thanks to Public Message fix)
This commit is contained in:
Robert Paciorek 2024-04-06 23:28:16 +00:00 committed by Spirtix
parent 8ca7b51161
commit 146b366e44
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CommandHandlers/PublicMessageHandlers.cs
View File

@ -17,9 +17,9 @@ class RacingPMHandler : CommandHandler
data.Add("M", new string[] { data.Add("M", new string[] {
receivedObject.Get<NetworkObject>("p").Get<string>("M") receivedObject.Get<NetworkObject>("p").Get<string>("M")
}); });
data.Add("MID", client.ClientID);
arr.Add(data); arr.Add(data);
p.Add("arr", arr); p.Add("arr", arr);
p.Add("MID", client.ClientID);
cmd.Add("c", "PM"); cmd.Add("c", "PM");
cmd.Add("p", p); cmd.Add("p", p);
NetworkPacket packet = NetworkObject.WrapObject(1, 13, cmd).Serialize(); NetworkPacket packet = NetworkObject.WrapObject(1, 13, cmd).Serialize();

1
src/Core/Room.cs
View File

@ -38,7 +38,6 @@ public class Room {
public IEnumerable<Client> Clients { public IEnumerable<Client> Clients {
get { get {
List<Client> list;
roomLock.EnterReadLock(); roomLock.EnterReadLock();
try { try {
return new List<Client>(clients); return new List<Client>(clients);

9
src/Core/WorldEvent.cs
View File

@ -84,8 +84,13 @@ class WorldEvent {
nextStartTime = DateTime.UtcNow.AddMinutes(minutes); nextStartTime = DateTime.UtcNow.AddMinutes(minutes);
else else
nextStartTime = startTime.AddMinutes(Configuration.ServerConfiguration.EventTimer); nextStartTime = startTime.AddMinutes(Configuration.ServerConfiguration.EventTimer);
nextStartTimeString = nextStartTime.ToString("MM/dd/yyyy HH:mm:ss");; nextStartTimeString = nextStartTime.ToString("MM/dd/yyyy HH:mm:ss");
SetTimer((nextStartTime - DateTime.UtcNow).TotalSeconds - 120, PreInit);
double timeout = (nextStartTime - DateTime.UtcNow).TotalSeconds - 120;
if (timeout > 0)
SetTimer((nextStartTime - DateTime.UtcNow).TotalSeconds - 120, PreInit);
else
Console.WriteLine($"Events disabled");
} }
// reset event and set timer to call PreEndEvent, send new WE_ info // reset event and set timer to call PreEndEvent, send new WE_ info

2
src/appsettings.json
View File

@ -15,7 +15,7 @@
"// FirstEventTimer": "time to start of first world event (battle ship event) after start MMO server", "// FirstEventTimer": "time to start of first world event (battle ship event) after start MMO server",
"FirstEventTimer": 3, "FirstEventTimer": 3,
"// EventTimer": "time between start of world events (battle ship events)", "// EventTimer": "time between start of world events (battle ship events), set both timer values (EventTimer and FirstEventTimer) to 0 to disable events",
"EventTimer": 30, "EventTimer": 30,
"// RacingMaxPlayers": "maximum players allowed in Thunder Run Racing (no more than 6)", "// RacingMaxPlayers": "maximum players allowed in Thunder Run Racing (no more than 6)",