This commit is contained in:
SilicaAndPina 2021-07-03 16:04:38 +12:00
parent fecef4521b
commit c17dc3e8bd
2 changed files with 11 additions and 4 deletions

View file

@ -323,7 +323,7 @@ namespace HISP.Server
// Call OnDisconnect // Call OnDisconnect
GameServer.OnDisconnect(this); GameServer.OnDisconnect(this);
LoggedIn = false; LoggedIn = false;
LoggedinUser = null; // LoggedinUser = null;
// Close Sockets // Close Sockets
ClientSocket.Close(); ClientSocket.Close();
ClientSocket.Dispose(); ClientSocket.Dispose();

View file

@ -195,6 +195,9 @@ namespace HISP.Server
foreach (GameClient client in ConnectedClients) foreach (GameClient client in ConnectedClients)
{ {
if (client == null)
continue;
if (client.LoggedIn) if (client.LoggedIn)
{ {
if (!client.LoggedinUser.MetaPriority) if (!client.LoggedinUser.MetaPriority)
@ -4805,7 +4808,7 @@ namespace HISP.Server
if (loggedInUser.Thirst <= 0 || loggedInUser.Hunger <= 0 || loggedInUser.Tiredness <= 0) if (loggedInUser.Thirst <= 0 || loggedInUser.Hunger <= 0 || loggedInUser.Tiredness <= 0)
{ {
if (RandomNumberGenerator.Next(0, 10) == 7 || sender.LoggedinUser.Username.ToLower() == "dream") if (RandomNumberGenerator.Next(0, 10) == 7)
{ {
byte[] possibleDirections = new byte[] { PacketBuilder.MOVE_UP, PacketBuilder.MOVE_DOWN, PacketBuilder.MOVE_RIGHT, PacketBuilder.MOVE_LEFT }; byte[] possibleDirections = new byte[] { PacketBuilder.MOVE_UP, PacketBuilder.MOVE_DOWN, PacketBuilder.MOVE_RIGHT, PacketBuilder.MOVE_LEFT };
@ -4825,12 +4828,15 @@ namespace HISP.Server
byte[] chatMessage = PacketBuilder.CreateChat(Messages.FormatRandomMovementMessage(Messages.StatHunger.ToUpper()), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] chatMessage = PacketBuilder.CreateChat(Messages.FormatRandomMovementMessage(Messages.StatHunger.ToUpper()), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(chatMessage); sender.SendPacket(chatMessage);
} }
/*
* Doesnt appear to acturally exist.
*
else if (loggedInUser.Tiredness <= 0) else if (loggedInUser.Tiredness <= 0)
{ {
byte[] chatMessage = PacketBuilder.CreateChat(Messages.FormatRandomMovementMessage(Messages.StatTired.ToUpper()), PacketBuilder.CHAT_BOTTOM_RIGHT); byte[] chatMessage = PacketBuilder.CreateChat(Messages.FormatRandomMovementMessage(Messages.StatTired.ToUpper()), PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(chatMessage); sender.SendPacket(chatMessage);
} }
*/
} }
} }
} }
@ -7215,6 +7221,8 @@ namespace HISP.Server
public static void OnDisconnect(GameClient sender) public static void OnDisconnect(GameClient sender)
{ {
connectedClients.Remove(sender);
if (sender.LoggedIn) if (sender.LoggedIn)
{ {
Database.SetPlayerLastLogin(Convert.ToInt32(new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds()), sender.LoggedinUser.Id); // Set last login date Database.SetPlayerLastLogin(Convert.ToInt32(new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds()), sender.LoggedinUser.Id); // Set last login date
@ -7262,7 +7270,6 @@ namespace HISP.Server
if (client.LoggedinUser.Id != sender.LoggedinUser.Id) if (client.LoggedinUser.Id != sender.LoggedinUser.Id)
client.SendPacket(playerRemovePacket); client.SendPacket(playerRemovePacket);
} }
connectedClients.Remove(sender);
} }