jack/MagicStorageVoidBag
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

fix: fix issue with orig() call not working by doing it ourselves

Browse Source
This commit is contained in:
Jack Bond-Preston
2022-07-10 01:16:06 +01:00
parent 9c3c2e8ea4
commit 5694035da3
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Hooks/StorageHeartRightClickHook.cs
View File

@ -1,24 +1,25 @@
using MagicStorage.Components;
using MagicStorageVoidBag.Items;
using MagicStorage.Items;
using Terraria;
using Terraria.DataStructures;
using Terraria.Localization;
using Terraria.ModLoader;
namespace MagicStorageVoidBag.Hooks {
internal class StorageHeartRightClickHook {
private static readonly log4net.ILog Logger = MagicStorageVoidBag.Instance.Logger;
public static bool Hook(On.MagicStorage.Components.StorageHeart.orig_RightClick orig, StorageHeart heart, int i, int j) {
public static bool Hook(On.MagicStorage.Components.StorageHeart.orig_RightClick orig, MagicStorage.Components.StorageHeart heart, int i, int j) {
// https://github.com/blushiemagic/MagicStorage/blob/1.4-stable/Components/StorageHeart.cs#L23
Player player = Main.LocalPlayer;
Item item = player.HeldItem;
if (item.type == ModContent.ItemType<MSVoidBag>()) {
if (item.ModItem == null) return false;
if (item.ModItem is Locator locator) {
if (Main.tile[i, j].TileFrameX % 36 == 18) i--;
if (Main.tile[i, j].TileFrameY % 36 == 18) j--;
MSVoidBag bag = (MSVoidBag)item.ModItem;
bag.location = new Point16(i, j);
locator.location = new Point16(i, j);
if (player.selectedItem == 58) {
Main.mouseItem = item.Clone();
}