From 2ee6c9a7c0c7c9a80ea9a55709c55363d7e1cd3a Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Sun, 16 Feb 2020 19:13:40 -0500
Subject: [PATCH] cache: add blocking mask to object definition

---
 .../net/runelite/cache/definitions/ObjectDefinition.java     | 1 +
 .../net/runelite/cache/definitions/loaders/ObjectLoader.java | 2 +-
 .../net/runelite/cache/definitions/savers/ObjectSaver.java   | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java
index 473a9d6c6b..38e00dc672 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/ObjectDefinition.java
@@ -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;
diff --git a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java
index edd50668f4..0857e2e99f 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/loaders/ObjectLoader.java
@@ -220,7 +220,7 @@ public class ObjectLoader
 		}
 		else if (opcode == 69)
 		{
-			is.readByte();
+			def.setBlockingMask(is.readByte());
 		}
 		else if (opcode == 70)
 		{
diff --git a/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java b/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java
index 8412240817..a688cdde7f 100644
--- a/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java
+++ b/cache/src/main/java/net/runelite/cache/definitions/savers/ObjectSaver.java
@@ -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);