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

Merge branch 'pr/19' into upsteam3

Browse Source
This commit is contained in:
xKylee
2020-02-20 17:57:43 +00:00
parent ab4734c7a4 36d41737f3
commit dfd9bf81f8
17 changed files with 271 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java vendored
View File

@@ -55,6 +55,7 @@ public class ObjectDefinition
private String[] actions = new String[5];
private int interactType = 2;
private int mapSceneID = -1;
private int blockingMask = 0;
private short[] recolorToReplace;
private boolean shadow = true;
private int modelSizeX = 128;

2
cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java vendored
View File

@@ -220,7 +220,7 @@ public class ObjectLoader
}
else if (opcode == 69)
{
is.readByte();
def.setBlockingMask(is.readByte());
}
else if (opcode == 70)
{

5
cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java vendored
View File

@@ -146,6 +146,11 @@ public class ObjectSaver
out.writeByte(68);
out.writeShort(obj.getMapSceneID());
}
if (obj.getBlockingMask() != 0)
{
out.writeByte(69);
out.writeByte(obj.getBlockingMask());
}
out.writeByte(70);
out.writeShort(obj.getOffsetX());
out.writeByte(71);