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

Fix Opening Present with ItemId 0

Browse source
This commit is contained in:
Bluzume 2021-11-27 00:44:18 -05:00
parent 65dbd60f8c
commit 92643bf4e2
5 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HorseIsleData

@ -1 +1 @@
Subproject commit 85caa27ee931439d76003b5471a9dac906b491ba Subproject commit 35bf0e04a686990d7237326c048fd18b3a081aa5

2
HorseIsleServer/HorseIsleServer/Game/Chat/Command.cs
View file

@ -82,7 +82,7 @@ namespace HISP.Game.Chat
} }
else else
{ {
itemId = Item.GetRandomItem(false).Id; itemId = Item.GetRandomItem().Id;
} }
Item.GetItemById(itemId); // Calling this makes sure this item id exists. Item.GetItemById(itemId); // Calling this makes sure this item id exists.

2
HorseIsleServer/HorseIsleServer/Game/Messages.cs
View file

@ -478,7 +478,7 @@ namespace HISP.Game
public static string SantaWrapItemFormat; public static string SantaWrapItemFormat;
public static string SantaWrappedObjectMessage; public static string SantaWrappedObjectMessage;
public static string SantaCantWrapInvFull; public static string SantaCantWrapInvFull;
public static string SantaCantOpenNothingInside;
public static string SantaItemOpenedFormat; public static string SantaItemOpenedFormat;
public static string SantaItemCantOpenInvFull; public static string SantaItemCantOpenInvFull;

2
HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
View file

@ -1558,7 +1558,7 @@ namespace HISP.Server
Messages.SantaWrapItemFormat = gameData.messages.meta.santa.wrap_format; Messages.SantaWrapItemFormat = gameData.messages.meta.santa.wrap_format;
Messages.SantaWrappedObjectMessage = gameData.messages.meta.santa.wrapped_object; Messages.SantaWrappedObjectMessage = gameData.messages.meta.santa.wrapped_object;
Messages.SantaCantWrapInvFull = gameData.messages.meta.santa.wrap_fail_inv_full; Messages.SantaCantWrapInvFull = gameData.messages.meta.santa.wrap_fail_inv_full;
Messages.SantaCantOpenNothingInside = gameData.messages.meta.santa.open_fail_empty;
Messages.SantaItemOpenedFormat = gameData.messages.meta.santa.open_format; Messages.SantaItemOpenedFormat = gameData.messages.meta.santa.open_format;
Messages.SantaItemCantOpenInvFull = gameData.messages.meta.santa.open_fail_inv_full; Messages.SantaItemCantOpenInvFull = gameData.messages.meta.santa.open_fail_inv_full;

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

@ -6455,8 +6455,14 @@ namespace HISP.Server
int newItem = item.ItemInstances[0].Data; int newItem = item.ItemInstances[0].Data;
if(newItem == 0) if(newItem == 0)
{ {
// TODO: Get "Present is empty" message.
sender.LoggedinUser.Inventory.Remove(item.ItemInstances[0]); sender.LoggedinUser.Inventory.Remove(item.ItemInstances[0]);
byte[] itemOpenFailedNothingInside = PacketBuilder.CreateChat(Messages.SantaCantOpenNothingInside, PacketBuilder.CHAT_BOTTOM_RIGHT);
sender.SendPacket(itemOpenFailedNothingInside);
UpdateInventory(sender);
break;
} }
try try
{ {