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

Add some checks

Browse source
This commit is contained in:
Bluzume 2021-11-28 22:37:55 -05:00
parent decdd109e4
commit 9ab8d071d9
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
HorseIsleServer/HorseIsleServer/Game/Inventory/ShopInventory.cs
View file

@ -115,6 +115,9 @@ namespace HISP.Game.Inventory
} }
public int GetSortPos(InventoryItem item) public int GetSortPos(InventoryItem item)
{ {
if (item == null)
return 0;
int bias = 1000; int bias = 1000;
int sortBy = Item.GetItemById(item.ItemId).SortBy; int sortBy = Item.GetItemById(item.ItemId).SortBy;
if (item.Infinite) if (item.Infinite)

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

@ -615,7 +615,10 @@ namespace HISP.Server
case PacketBuilder.SOCIALS_USE: case PacketBuilder.SOCIALS_USE:
int socialId = Convert.ToInt32(packet[2] - (byte)0x21); int socialId = Convert.ToInt32(packet[2] - (byte)0x21);
SocialType.Social social = SocialType.GetSocial(socialId); SocialType.Social social = SocialType.GetSocial(socialId);
/*
* Check if player being socialed with
* is actually on this tile, not muted, etc
*/
if (sender.LoggedinUser.SocializingWith != null && social.BaseSocialType.Type != "GROUP") if (sender.LoggedinUser.SocializingWith != null && social.BaseSocialType.Type != "GROUP")
{ {
if (sender.LoggedinUser.SocializingWith.MuteAll || sender.LoggedinUser.SocializingWith.MuteSocials) if (sender.LoggedinUser.SocializingWith.MuteAll || sender.LoggedinUser.SocializingWith.MuteSocials)