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

Merge branch 'master' of https://github.com/runelite/runelite

Browse Source 
 Conflicts:
	pom.xml
	runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
	runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
This commit is contained in:
PKLite
2019-08-29 06:37:00 -04:00
parent d3768f2208 844aa787ae
commit c1292b847d
7 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java
View File

@@ -159,6 +159,9 @@ public class ItemsKeptOnDeathPluginTest
final Item brace = mItem(ItemID.COMBAT_BRACELET1, 1, "Combat bracelet(1)", true, 0);
final int braceletOffset = FixedPriceItem.COMBAT_BRACELET1.getOffset();
assertEquals(13500 + braceletOffset, plugin.getDeathPrice(brace));
final Item amulet = mItem(ItemID.SALVE_AMULETEI, 1, "Salve Amulet(ei)", false, 300);
assertEquals(210200, plugin.getDeathPrice(amulet));
}
@Test