ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

project: Fix upstream merge (#1157)

Browse Source 
* Fix upstream merge

* Update RSItemContainerMixin.java
This commit is contained in:
Lucwousin
2019-07-28 00:05:55 +02:00
committed by Kyleeld
parent 9ed6f586dd
commit 22f6146ea7
25 changed files with 3548 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java
View File

@@ -33,7 +33,6 @@ import net.runelite.api.mixins.Mixin;
import net.runelite.api.mixins.Replace;
import net.runelite.api.mixins.Shadow;
import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSTileItem;
import net.runelite.rs.api.RSItemContainer;
@Mixin(RSItemContainer.class)
@@ -58,9 +57,10 @@ public abstract class RSItemContainerMixin implements RSItemContainer
for (int i = 0; i < itemIds.length; ++i)
{
RSTileItem item = client.createItem();
item.setId(itemIds[i]);
item.setQuantity(stackSizes[i]);
Item item = new Item(
itemIds[i],
stackSizes[i]
);
items[i] = item;
}
@@ -70,7 +70,6 @@ public abstract class RSItemContainerMixin implements RSItemContainer
@Copy("itemContainerSetItem")
static void rs$itemContainerSetItem(int itemContainerId, int index, int itemId, int itemQuantity)
{
}
@Replace("itemContainerSetItem")

3
runelite-mixins/src/main/java/net/runelite/mixins/RSTileItemMixin.java
View File

@@ -39,8 +39,7 @@ public abstract class RSTileItemMixin implements RSTileItem
}
Tile[][][] tiles = client.getScene().getTiles();
Tile tile = tiles[client.getPlane()][x][y];
return tile;
return tiles[client.getPlane()][x][y];
}
@Inject

4
runelite-mixins/src/main/java/net/runelite/mixins/RSTileMixin.java
View File

@@ -31,7 +31,7 @@ import net.runelite.api.CollisionDataFlag;
import net.runelite.api.Constants;
import net.runelite.api.DecorativeObject;
import net.runelite.api.GroundObject;
import net.runelite.api.ItemLayer;
import net.runelite.api.TileItemPile;
import net.runelite.api.Node;
import net.runelite.api.Point;
import net.runelite.api.Tile;
@@ -235,7 +235,7 @@ public abstract class RSTileMixin implements RSTile
@Override
public List<TileItem> getGroundItems()
{
ItemLayer layer = this.getItemLayer();
TileItemPile layer = this.getItemLayer();
if (layer == null)
{
return null;