diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 720d180195..0af0d449e2 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,7 +27,7 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.7.7" - const val openosrsVersion = "4.6.1" + const val openosrsVersion = "4.6.2" const val rsversion = 195 const val cacheversion = 165 diff --git a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java index 82c6781949..057acdc08a 100644 --- a/runelite-api/src/main/java/net/runelite/api/kit/KitType.java +++ b/runelite-api/src/main/java/net/runelite/api/kit/KitType.java @@ -51,7 +51,10 @@ public enum KitType HANDS("Hands"), BOOTS("Boots"), JAW("Jaw"), + // When removing these, make sure you also remove the type.ordinal() > 11 checks in RSPlayerCompositionMixin + @Deprecated(since = "4.6.2", forRemoval = true) RING("Ring"), + @Deprecated(since = "4.6.2", forRemoval = true) AMMUNITION("Ammo"); private final String name; diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java index 182bb53d1b..32fd72d36b 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSPlayerCompositionMixin.java @@ -12,6 +12,11 @@ public abstract class RSPlayerCompositionMixin implements RSPlayerComposition @Override public int getEquipmentId(KitType type) { + if (type.ordinal() > 11) + { + return -1; + } + int id = getEquipmentIds()[type.getIndex()]; if (id < 512) { @@ -24,6 +29,11 @@ public abstract class RSPlayerCompositionMixin implements RSPlayerComposition @Override public int getKitId(KitType type) { + if (type.ordinal() > 11) + { + return -1; + } + int id = getEquipmentIds()[type.getIndex()]; if (id < 256 || id >= 512) {