From 936f83793de72b7bbc5fe3bff39fb30b00ba4b90 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 29 Apr 2022 08:28:20 +0200 Subject: [PATCH] project: Fix merge --- .../main/java/net/runelite/cache/item/ItemSpriteFactory.java | 4 ---- .../src/main/java/net/runelite/api/ObjectComposition.java | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java b/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java index 16147b1a97..dbbfb08404 100644 --- a/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java +++ b/cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java @@ -91,11 +91,7 @@ public class ItemSpriteFactory else if (item.boughtTemplateId != -1) { auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider, -<<<<<<< HEAD - item.boughtId, quantity, border, shadowColor, false); -======= item.boughtId, quantity, border, 0, false); ->>>>>>> runelite/master if (auxSpritePixels == null) { return null; diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectComposition.java b/runelite-api/src/main/java/net/runelite/api/ObjectComposition.java index 11e2e72f2a..76aea5c25f 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectComposition.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectComposition.java @@ -77,12 +77,12 @@ public interface ObjectComposition extends ParamHolder ObjectComposition getImpostor(); /** -<<<<<<< HEAD * Get the bitmask that contains information on which directions you can interact * with this object from. */ int getAccessBitMask(); -======= + + /** * Gets the {@link Varbits} used to switch this multiloc, or {@code -1} if this is not switched by a Varbit * * @see #getImpostor() @@ -98,5 +98,4 @@ public interface ObjectComposition extends ParamHolder * @see #getImpostorIds() */ int getVarPlayerId(); ->>>>>>> runelite/master }