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

project: Fix merge

Browse Source
This commit is contained in:
Owain van Brakel
2022-04-29 08:28:20 +02:00
parent 53a4025245
commit 936f83793d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cache/src/main/java/net/runelite/cache/item/ItemSpriteFactory.java vendored
View File

@@ -91,11 +91,7 @@ public class ItemSpriteFactory
else if (item.boughtTemplateId != -1) else if (item.boughtTemplateId != -1)
{ {
auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider, auxSpritePixels = createSpritePixels(itemProvider, modelProvider, spriteProvider, textureProvider,
<<<<<<< HEAD
item.boughtId, quantity, border, shadowColor, false);
=======
item.boughtId, quantity, border, 0, false); item.boughtId, quantity, border, 0, false);
>>>>>>> runelite/master
if (auxSpritePixels == null) if (auxSpritePixels == null)
{ {
return null; return null;

5
runelite-api/src/main/java/net/runelite/api/ObjectComposition.java
View File

@@ -77,12 +77,12 @@ public interface ObjectComposition extends ParamHolder
ObjectComposition getImpostor(); ObjectComposition getImpostor();
/** /**
<<<<<<< HEAD
* Get the bitmask that contains information on which directions you can interact * Get the bitmask that contains information on which directions you can interact
* with this object from. * with this object from.
*/ */
int getAccessBitMask(); int getAccessBitMask();
=======
/**
* Gets the {@link Varbits} used to switch this multiloc, or {@code -1} if this is not switched by a Varbit * Gets the {@link Varbits} used to switch this multiloc, or {@code -1} if this is not switched by a Varbit
* *
* @see #getImpostor() * @see #getImpostor()
@@ -98,5 +98,4 @@ public interface ObjectComposition extends ParamHolder
* @see #getImpostorIds() * @see #getImpostorIds()
*/ */
int getVarPlayerId(); int getVarPlayerId();
>>>>>>> runelite/master
} }