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

Merge pull request #724 from devLotto/model-fix

Browse Source 
Fix ArrayIndexOutOfBoundsException on getting vertices of certain gameobjects
This commit is contained in:
Tomas Slusny
2018-02-27 17:10:12 +01:00
committed by GitHub
parent cc8e8f7006 141f5ac778
commit bec15addbb
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-mixins/src/main/java/net/runelite/mixins/RSModelMixin.java
View File

@@ -45,7 +45,7 @@ public abstract class RSModelMixin implements RSModel
List<Vertex> vertices = new ArrayList<Vertex>(); List<Vertex> vertices = new ArrayList<Vertex>();
for (int i = 0; i < verticesX.length; ++i) for (int i = 0; i < getVerticesCount(); ++i)
{ {
Vertex v = new Vertex( Vertex v = new Vertex(
verticesX[i], verticesX[i],
@@ -67,9 +67,9 @@ public abstract class RSModelMixin implements RSModel
int[] trianglesZ = getTrianglesZ(); int[] trianglesZ = getTrianglesZ();
List<Vertex> vertices = getVertices(); List<Vertex> vertices = getVertices();
List<Triangle> triangles = new ArrayList<Triangle>(trianglesX.length); List<Triangle> triangles = new ArrayList<Triangle>(getTrianglesCount());
for (int i = 0; i < trianglesX.length; ++i) for (int i = 0; i < getTrianglesCount(); ++i)
{ {
int triangleX = trianglesX[i]; int triangleX = trianglesX[i];
int triangleY = trianglesY[i]; int triangleY = trianglesY[i];

6
runescape-api/src/main/java/net/runelite/rs/api/RSModel.java
View File

@@ -29,6 +29,9 @@ import net.runelite.mapping.Import;
public interface RSModel extends RSRenderable, Model public interface RSModel extends RSRenderable, Model
{ {
@Import("verticesCount")
int getVerticesCount();
@Import("verticesX") @Import("verticesX")
int[] getVerticesX(); int[] getVerticesX();
@@ -38,6 +41,9 @@ public interface RSModel extends RSRenderable, Model
@Import("verticesZ") @Import("verticesZ")
int[] getVerticesZ(); int[] getVerticesZ();
@Import("indicesCount")
int getTrianglesCount();
@Import("indices1") @Import("indices1")
int[] getTrianglesX(); int[] getTrianglesX();