Fix Serverside NullReferenceException
Forgot to check whether wormholes are null before calling LINQ method. Could it be that simple..?
This commit is contained in:
parent
cddeaf38a9
commit
87e02af5b0
3 changed files with 13 additions and 14 deletions
|
|
@ -21645,7 +21645,7 @@ MonoBehaviour:
|
|||
ZoneTabButton: {fileID: 618245060}
|
||||
GalaxyZonePrototype: {fileID: 559120531}
|
||||
GalaxyZoneLinkPrototype: {fileID: 899487252}
|
||||
GalaxyBackground: {fileID: 0}
|
||||
GalaxyBackground: {fileID: 1938745697}
|
||||
GalaxyScale: 1000
|
||||
ZoneObjectPrototype: {fileID: 1007041026}
|
||||
PlanetSprite: {fileID: 2800000, guid: 0d2acbd593b7fd349b0b26b4844733ef, type: 3}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ namespace ChatApp.Server
|
|||
Name = zd.Name,
|
||||
Position = zd.Position,
|
||||
ZoneID = zd.ID,
|
||||
Links = zd.Wormholes.ToArray()
|
||||
Links = zd.Wormholes?.ToArray() ?? Array.Empty<Guid>()
|
||||
}).ToArray(),
|
||||
GlobalData = context.GlobalData,
|
||||
StarDensity = cache.Get<GalaxyMapLayerData>(context.GlobalData.MapLayers["StarDensity"])
|
||||
|
|
@ -128,7 +128,7 @@ namespace ChatApp.Server
|
|||
// Zone has not been populated, generate the contents now!
|
||||
if (!zone.Planets.Any())
|
||||
{
|
||||
var planets = ZoneGenerator.GenerateEntities(context, zone, 10000, 2000);
|
||||
var planets = ZoneGenerator.GenerateEntities(context, zone, 100000, 2000);
|
||||
|
||||
// Create collections to map between zone generator output and database entries
|
||||
var orbitMap = new Dictionary<Planet, OrbitData>();
|
||||
|
|
|
|||
|
|
@ -107,7 +107,6 @@ using Microsoft.Extensions.Logging;
|
|||
return;
|
||||
message.Peer = peer;
|
||||
var user = _users[peer.Id];
|
||||
Guid guid;
|
||||
var type = message.GetType();
|
||||
|
||||
if (type == typeof(LoginMessage) || type == typeof(RegisterMessage) || type == typeof(VerifyMessage))
|
||||
|
|
@ -118,6 +117,7 @@ using Microsoft.Extensions.Logging;
|
|||
return;
|
||||
}
|
||||
|
||||
Guid sessionGuid;
|
||||
switch (message)
|
||||
{
|
||||
case RegisterMessage register when !IsValidUsername(register.Name):
|
||||
|
|
@ -128,21 +128,20 @@ using Microsoft.Extensions.Logging;
|
|||
return;
|
||||
case RegisterMessage register:
|
||||
{
|
||||
peer.Send(new LoginSuccessMessage {Session = Guid.NewGuid()});
|
||||
|
||||
guid = Guid.NewGuid();
|
||||
sessionGuid = Guid.NewGuid();
|
||||
peer.Send(new LoginSuccessMessage {Session = sessionGuid});
|
||||
|
||||
var newUserData = new Player
|
||||
{
|
||||
ID = guid,
|
||||
ID = Guid.NewGuid(),
|
||||
Email = register.Email,
|
||||
Password = Argon2.Hash(register.Password, null, memoryCost: 16384),
|
||||
Username = register.Name
|
||||
};
|
||||
_database.Add(newUserData);
|
||||
|
||||
_sessions[guid] = new Session {Data = newUserData, LastUpdate = DateTime.Now};
|
||||
_users[peer.Id].SessionGuid = guid;
|
||||
_sessions[sessionGuid] = new Session {Data = newUserData, LastUpdate = DateTime.Now};
|
||||
_users[peer.Id].SessionGuid = sessionGuid;
|
||||
break;
|
||||
}
|
||||
case VerifyMessage verify when _sessions.ContainsKey(verify.Session):
|
||||
|
|
@ -167,11 +166,11 @@ using Microsoft.Extensions.Logging;
|
|||
return;
|
||||
}
|
||||
|
||||
guid = Guid.NewGuid();
|
||||
peer.Send(new LoginSuccessMessage {Session = guid});
|
||||
sessionGuid = Guid.NewGuid();
|
||||
peer.Send(new LoginSuccessMessage {Session = sessionGuid});
|
||||
|
||||
_sessions.Add(guid, new Session { Data = userData, LastUpdate = DateTime.Now });
|
||||
_users[peer.Id].SessionGuid = guid;
|
||||
_sessions.Add(sessionGuid, new Session { Data = userData, LastUpdate = DateTime.Now });
|
||||
_users[peer.Id].SessionGuid = sessionGuid;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue