IsleHorse/HISP
1
0
Fork 0
mirror of https://github.com/islehorse/HISP.git synced 2025-04-12 07:59:48 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Close social windows when player moves

Browse source
This commit is contained in:
SilicaAndPina 2021-03-10 12:21:51 +13:00
parent 99c604e926
commit 2b59ba1be9
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Horse Isle Server/HorseIsleServer/Player/User.cs
View file

@ -97,6 +97,7 @@ namespace HISP.Player
public Riddler LastRiddle; public Riddler LastRiddle;
public Award Awards; public Award Awards;
public User SocializingWith; public User SocializingWith;
public List<User> BeingSocializedBy = new List<User>();
public User PendingBuddyRequestTo; public User PendingBuddyRequestTo;
public int CapturingHorseId; public int CapturingHorseId;
public DateTime LoginTime; public DateTime LoginTime;

10
Horse Isle Server/HorseIsleServer/Server/GameServer.cs
View file

@ -503,6 +503,8 @@ namespace HISP.Server
if(IsUserOnline(playerId)) if(IsUserOnline(playerId))
{ {
sender.LoggedinUser.SocializingWith = GetUserById(playerId); sender.LoggedinUser.SocializingWith = GetUserById(playerId);
sender.LoggedinUser.SocializingWith.BeingSocializedBy.Add(sender.LoggedinUser);
sender.LoggedinUser.MetaPriority = true; sender.LoggedinUser.MetaPriority = true;
byte[] metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildSocialMenu(sender.LoggedinUser.CurrentlyRidingHorse != null)); byte[] metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildSocialMenu(sender.LoggedinUser.CurrentlyRidingHorse != null));
sender.SendPacket(metaPacket); sender.SendPacket(metaPacket);
@ -4487,9 +4489,15 @@ namespace HISP.Server
} }
} }
// Cancel Trades
if (loggedInUser.TradingWith != null) if (loggedInUser.TradingWith != null)
loggedInUser.TradingWith.CancelTradeMoved(); loggedInUser.TradingWith.CancelTradeMoved();
loggedInUser.PendingBuddyRequestTo = null; loggedInUser.PendingBuddyRequestTo = null;
// Close Social Windows
foreach (User sUser in loggedInUser.BeingSocializedBy.ToArray())
UpdateArea(sUser.LoggedinClient);
loggedInUser.BeingSocializedBy.Clear();
byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, loggedInUser.Facing, direction, true); byte[] moveResponse = PacketBuilder.CreateMovementPacket(loggedInUser.X, loggedInUser.Y, loggedInUser.CharacterId, loggedInUser.Facing, direction, true);
sender.SendPacket(moveResponse); sender.SendPacket(moveResponse);