Skip to content

Commit

Permalink
Update for 14.8.6.30268
Browse files Browse the repository at this point in the history
  • Loading branch information
Lacyway committed May 30, 2024
1 parent fb87eaf commit dd7172a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Fika.Core/Coop/GameMode/CoopGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1629,7 +1629,7 @@ public override void Stop(string profileId, ExitStatus exitStatus, string exitNa
{
if (myPlayer.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem != null)
{
GStruct414<GClass2798> result = InteractionsHandlerClass.Remove(myPlayer.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem, myPlayer.GClass2774_0, false, true);
GStruct415<GClass2798> result = InteractionsHandlerClass.Remove(myPlayer.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem, myPlayer.GClass2774_0, false, true);
if (result.Error != null)
{
FikaPlugin.Instance.FikaLogger.LogWarning("CoopGame::Stop: Error removing dog tag!");
Expand Down Expand Up @@ -1777,7 +1777,7 @@ private void StopFromError(string profileId, ExitStatus exitStatus)
{
if (myPlayer.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem != null)
{
GStruct414<GClass2798> result = InteractionsHandlerClass.Remove(myPlayer.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem, myPlayer.GClass2774_0, false, true);
GStruct415<GClass2798> result = InteractionsHandlerClass.Remove(myPlayer.Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem, myPlayer.GClass2774_0, false, true);
if (result.Error != null)
{
FikaPlugin.Instance.FikaLogger.LogWarning("CoopGame::StopFromError: Error removing dog tag!");
Expand Down
12 changes: 6 additions & 6 deletions Fika.Core/Coop/Players/CoopPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ protected virtual void Start()
{
if (Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem != null)
{
GStruct414<GClass2798> result = InteractionsHandlerClass.Remove(Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem, _inventoryController, false, true);
GStruct415<GClass2798> result = InteractionsHandlerClass.Remove(Equipment.GetSlot(EquipmentSlot.Dogtag).ContainedItem, _inventoryController, false, true);
if (result.Error != null)
{
FikaPlugin.Instance.FikaLogger.LogWarning("CoopPlayer::Start: Error removing dog tag!");
Expand Down Expand Up @@ -1036,7 +1036,7 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet)
using BinaryReader binaryReader = new(memoryStream);
try
{
GStruct411 result = ToInventoryOperation(binaryReader.ReadPolymorph<GClass1542>());
GStruct412 result = ToInventoryOperation(binaryReader.ReadPolymorph<GClass1542>());

InventoryOperationHandler opHandler = new(result);

Expand Down Expand Up @@ -1406,7 +1406,7 @@ public Item FindItem(string itemId)
return item;
}

GStruct416<Item> itemResult = FindItemById(itemId);
GStruct417<Item> itemResult = FindItemById(itemId);
if (itemResult.Error != null)
{
FikaPlugin.Instance.FikaLogger.LogError($"CoopPlayer::FindItem: Could not find item with id '{itemId}' in the world at all.");
Expand All @@ -1418,17 +1418,17 @@ public Item FindItem(string itemId)
private class KeyHandler(CoopPlayer player)
{
private readonly CoopPlayer player = player;
public GStruct416<GClass2981> unlockResult;
public GStruct417<GClass2981> unlockResult;

internal void HandleKeyEvent()
{
unlockResult.Value.RaiseEvents(player._inventoryController, CommandStatus.Succeed);
}
}

private class InventoryOperationHandler(GStruct411 opResult)
private class InventoryOperationHandler(GStruct412 opResult)
{
public readonly GStruct411 opResult = opResult;
public readonly GStruct412 opResult = opResult;

internal void HandleResult(IResult result)
{
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Networking/FikaServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ private void OnInventoryPacketReceived(InventoryPacket packet, NetPeer peer)
using BinaryReader binaryReader = new(memoryStream);
try
{
GStruct411 result = playerToApply.ToInventoryOperation(binaryReader.ReadPolymorph<GClass1542>());
GStruct412 result = playerToApply.ToInventoryOperation(binaryReader.ReadPolymorph<GClass1542>());

InventoryOperationHandler opHandler = new()
{
Expand Down Expand Up @@ -733,7 +733,7 @@ public void OnNetworkReceive(NetPeer peer, NetPacketReader reader, byte channelN

private class InventoryOperationHandler
{
public GStruct411 opResult;
public GStruct412 opResult;
public uint operationId;
public int netId;
public NetPeer peer;
Expand Down
Binary file modified References/hollowed.dll
Binary file not shown.

0 comments on commit dd7172a

Please sign in to comment.