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

Fix MULTIROOM priority shenanigans

Browse source
This commit is contained in:
Bluzume 2021-11-26 20:44:47 -05:00
parent d306b3a9ef
commit 52e5e6a883
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
HorseIsleServer/HorseIsleServer/Game/Multiroom.cs
View file

@ -82,7 +82,7 @@ namespace HISP.Game
foreach (User joinedUser in JoinedUsers) foreach (User joinedUser in JoinedUsers)
if (joinedUser.Id != user.Id) if (joinedUser.Id != user.Id)
if(!TwoPlayer.IsPlayerInGame(joinedUser)) if(!TwoPlayer.IsPlayerInGame(joinedUser))
if(!joinedUser.ListingAuction) if(!joinedUser.MajorPriority)
GameServer.UpdateArea(joinedUser.LoggedinClient); GameServer.UpdateArea(joinedUser.LoggedinClient);
} }
@ -99,7 +99,7 @@ namespace HISP.Game
foreach (User joinedUser in JoinedUsers) foreach (User joinedUser in JoinedUsers)
if (!TwoPlayer.IsPlayerInGame(joinedUser)) if (!TwoPlayer.IsPlayerInGame(joinedUser))
if (!joinedUser.ListingAuction) if (!joinedUser.MajorPriority)
GameServer.UpdateArea(joinedUser.LoggedinClient); GameServer.UpdateArea(joinedUser.LoggedinClient);
} }

1
HorseIsleServer/HorseIsleServer/Player/User.cs
View file

@ -125,7 +125,6 @@ namespace HISP.Player
public string LastSeenWeather; public string LastSeenWeather;
public string AutoReplyText = ""; public string AutoReplyText = "";
public int LastClickedRanchBuilding = 0; public int LastClickedRanchBuilding = 0;
public bool ListingAuction = false;
public int TotalGlobalChatMessages = 1; public int TotalGlobalChatMessages = 1;
public User[] BeingSocializedBy public User[] BeingSocializedBy
{ {

7
HorseIsleServer/HorseIsleServer/Server/GameServer.cs
View file

@ -3178,7 +3178,6 @@ namespace HISP.Server
break; break;
case "41": // Put horse into auction case "41": // Put horse into auction
sender.LoggedinUser.MajorPriority = true; sender.LoggedinUser.MajorPriority = true;
sender.LoggedinUser.ListingAuction = true;
metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildAuctionHorseList(sender.LoggedinUser)); metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildAuctionHorseList(sender.LoggedinUser));
sender.SendPacket(metaPacket); sender.SendPacket(metaPacket);
break; break;
@ -3541,6 +3540,7 @@ namespace HISP.Server
entry.Completed = false; entry.Completed = false;
inst.Hidden = true; inst.Hidden = true;
auctionRoom.AddEntry(entry); auctionRoom.AddEntry(entry);
UpdateArea(sender);
UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y, true); UpdateAreaForAll(sender.LoggedinUser.X, sender.LoggedinUser.Y, true);
break; break;
} }
@ -7819,6 +7819,9 @@ namespace HISP.Server
} }
public static void UpdateHorseMenu(GameClient forClient, HorseInstance horseInst) public static void UpdateHorseMenu(GameClient forClient, HorseInstance horseInst)
{ {
forClient.LoggedinUser.MajorPriority = true;
int TileID = Map.GetTileId(forClient.LoggedinUser.X, forClient.LoggedinUser.Y, false); int TileID = Map.GetTileId(forClient.LoggedinUser.X, forClient.LoggedinUser.Y, false);
string type = Map.TerrainTiles[TileID - 1].Type; string type = Map.TerrainTiles[TileID - 1].Type;
@ -7827,7 +7830,6 @@ namespace HISP.Server
else else
forClient.LoggedinUser.LastViewedHorseOther = horseInst; forClient.LoggedinUser.LastViewedHorseOther = horseInst;
forClient.LoggedinUser.MajorPriority = true;
byte[] metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildHorseInformation(horseInst, forClient.LoggedinUser)); byte[] metaPacket = PacketBuilder.CreateMetaPacket(Meta.BuildHorseInformation(horseInst, forClient.LoggedinUser));
forClient.SendPacket(metaPacket); forClient.SendPacket(metaPacket);
@ -7939,7 +7941,6 @@ namespace HISP.Server
forClient.LoggedinUser.MajorPriority = false; forClient.LoggedinUser.MajorPriority = false;
forClient.LoggedinUser.MinorPriority = false; forClient.LoggedinUser.MinorPriority = false;
forClient.LoggedinUser.ListingAuction = false;
string LocationStr = ""; string LocationStr = "";
int tileX = forClient.LoggedinUser.X; int tileX = forClient.LoggedinUser.X;