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

project: upstream merge

Browse Source
This commit is contained in:
zjustin
2022-03-20 16:51:25 +11:00
parent 57a73b0611
commit 11714f1eec
12 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-mixins/src/main/java/net/runelite/mixins/RSBoundaryObjectMixin.java
View File

@@ -78,8 +78,8 @@ public abstract class RSBoundaryObjectMixin implements RSBoundaryObject
@Override
public Shape getClickbox()
{
Shape clickboxA = Perspective.getClickbox(client, getModelA(), 0, getLocalLocation());
Shape clickboxB = Perspective.getClickbox(client, getModelB(), 0, getLocalLocation());
Shape clickboxA = Perspective.getClickbox(client, getModelA(), 0, getX(), getY(), getZ());
Shape clickboxB = Perspective.getClickbox(client, getModelB(), 0, getX(), getY(), getZ());
if (clickboxA == null && clickboxB == null)
{

2
runelite-mixins/src/main/java/net/runelite/mixins/RSFloorDecorationMixin.java
View File

@@ -77,6 +77,6 @@ public abstract class RSFloorDecorationMixin implements RSFloorDecoration
@Override
public Shape getClickbox()
{
return Perspective.getClickbox(client, getModel(), 0, getLocalLocation());
return Perspective.getClickbox(client, getModel(), 0, getX(), getY(), getZ());
}
}

2
runelite-mixins/src/main/java/net/runelite/mixins/RSGameObjectMixin.java
View File

@@ -97,7 +97,7 @@ public abstract class RSGameObjectMixin implements RSGameObject
@Override
public Shape getClickbox()
{
return Perspective.getClickbox(client, getModel(), getModelOrientation(), getLocalLocation());
return Perspective.getClickbox(client, getModel(), getModelOrientation(), getX(), getY(), getZ());
}
@Inject

7
runelite-mixins/src/main/java/net/runelite/mixins/RSWallDecorationMixin.java
View File

@@ -86,11 +86,8 @@ public abstract class RSWallDecorationMixin implements RSWallDecoration
@Override
public Shape getClickbox()
{
LocalPoint lp = getLocalLocation();
Shape clickboxA = Perspective.getClickbox(client, getModel1(), 0,
new LocalPoint(lp.getX() + getXOffset(), lp.getY() + getYOffset()));
Shape clickboxB = Perspective.getClickbox(client, getModel2(), 0, lp);
Shape clickboxA = Perspective.getClickbox(client, getModel1(), 0, getX() + getXOffset(), getY() + getYOffset(), getZ());
Shape clickboxB = Perspective.getClickbox(client, getModel2(), 0, getX(), getY(), getZ());
if (clickboxA == null && clickboxB == null)
{

2
runelite-mixins/src/main/java/net/runelite/mixins/RuneLiteObjectMixin.java
View File

@@ -51,7 +51,7 @@ public abstract class RuneLiteObjectMixin implements RSRuneLiteObject
setX(localPoint.getX());
setY(localPoint.getY());
setLevel(plane);
setHeight(Perspective.getTileHeight(client, localPoint, plane));
setZ(Perspective.getTileHeight(client, localPoint, plane));
}
@Inject