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

Merge pull request #5445 from devLotto/issue-1979

Browse Source 
entityhider: make hidden entities not occupy the tile they're on
This commit is contained in:
Tomas Slusny
2018-09-18 13:35:02 +02:00
committed by GitHub
parent 4ce43c8a00 18851f1094
commit 396f24e39d
3 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java
View File

@@ -77,12 +77,25 @@ public abstract class EntityHiderMixin implements RSScene
private static boolean hideProjectiles;
@Copy("addEntityMarker")
abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13);
abstract boolean addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13);
@Replace("addEntityMarker")
boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13)
boolean rl$addEntityMarker(int var1, int var2, int var3, int var4, int var5, int x, int y, int var8, RSRenderable renderable, int var10, boolean var11, long var12, int var13)
{
return shouldDraw(renderable, false) && addEntityMarker(var1, var2, var3, var4, var5, var6, var7, var8, renderable, var10, var11, var12, var13);
final boolean shouldDraw = shouldDraw(renderable, false);
if (!shouldDraw)
{
final int tileX = x >> 7;
final int tileY = y >> 7;
/*
* Set the 'occupied' tick to -1, to reset the tile being 'occupied',
* making the game think an entity hasn't been rendered at the location yet.
*/
client.getOccupiedTilesTick()[tileX][tileY] = -1;
}
return shouldDraw && addEntityMarker(var1, var2, var3, var4, var5, x, y, var8, renderable, var10, var11, var12, var13);
}
@Copy("draw2DExtras")