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 into upstream2605

Browse Source 
 Conflicts:
	cache-client/pom.xml
	cache-updater/pom.xml
	cache/pom.xml
	pom.xml
	runelite-api/pom.xml
	runelite-client/pom.xml
	runelite-jshell/pom.xml
	runelite-script-assembler-plugin/pom.xml
This commit is contained in:
Justin
2022-05-26 21:31:08 +10:00
parent 466770ad50 6eae5d08fa
commit 6fd1cfbdaf
12 changed files with 476 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9616,7 +9616,6 @@ public final class NpcID
public static final int MEDIUM_ELEMENTAL_GUARDIAN = 11415;
public static final int STRONG_ELEMENTAL_GUARDIAN = 11416;
public static final int OVERCHARGED_ELEMENTAL_GUARDIAN = 11417;
public static final int APPRENTICE_TAMARA = 11426;
public static final int APPRENTICE_CORDELIA = 11427;
public static final int GREATISH_GUARDIAN_11428 = 11428;
public static final int ABYSSAL_PROTECTOR_11429 = 11429;
@@ -9630,7 +9629,7 @@ public final class NpcID
public static final int WIZARD_PERSTEN_11437 = 11437;
public static final int WIZARD_PERSTEN_11438 = 11438;
public static final int WIZARD_PERSTEN_11439 = 11439;
public static final int APPRENTICE_TAMARA_11440 = 11440;
public static final int APPRENTICE_TAMARA = 11440;
public static final int APPRENTICE_TAMARA_11441 = 11441;
public static final int APPRENTICE_TAMARA_11442 = 11442;
public static final int APPRENTICE_CORDELIA_11443 = 11443;
@@ -9649,6 +9648,8 @@ public final class NpcID
public static final int THE_GREAT_GUARDIAN_11456 = 11456;
public static final int MENAPHITE_SHADOW = 11462;
public static final int REANIMATED_HELLHOUND = 11463;
public static final int APPRENTICE_TAMARA_11464 = 11464;
public static final int APPRENTICE_TAMARA_11465 = 11465;
public static final int TARIK_11473 = 11473;
public static final int MAISA_11474 = 11474;
public static final int MAISA_11475 = 11475;

1
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
View File

@@ -1793,6 +1793,7 @@ public final class NullNpcID
public static final int NULL_11423 = 11423;
public static final int NULL_11424 = 11424;
public static final int NULL_11425 = 11425;
public static final int NULL_11426 = 11426;
public static final int NULL_11457 = 11457;
public static final int NULL_11458 = 11458;
public static final int NULL_11459 = 11459;

7
runelite-api/src/main/java/net/runelite/api/Player.java
View File

@@ -32,6 +32,13 @@ import javax.annotation.Nullable;
*/
public interface Player extends Actor
{
/**
* Get the ID of the player
*
* @return
*/
int getId();
@Override
int getCombatLevel();