From b559a6b1af0e562f9f8c0b1e63560fc70f29fbd9 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 1 Oct 2018 23:02:05 -0600 Subject: [PATCH] Add thread assertions to Widget --- .../main/java/net/runelite/mixins/RSWidgetMixin.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index cc22c7b71f..a85d62000a 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -113,6 +113,8 @@ public abstract class RSWidgetMixin implements RSWidget @Override public int getParentId() { + assert client.isClientThread(); + int rsParentId = getRSParentId(); if (rsParentId != -1) { @@ -198,6 +200,8 @@ public abstract class RSWidgetMixin implements RSWidget @Override public boolean isHidden() { + assert client.isClientThread(); + if (isSelfHidden()) { return true; @@ -359,6 +363,8 @@ public abstract class RSWidgetMixin implements RSWidget @Override public Widget[] getNestedChildren() { + assert client.isClientThread(); + if (getRSParentId() == getId()) { // This is a dynamic widget, so it can't have nested children @@ -494,6 +500,8 @@ public abstract class RSWidgetMixin implements RSWidget @Override public Widget createChild(int index, int type) { + assert client.isClientThread(); + RSWidget w = client.createWidget(); w.setType(type); w.setParentId(getId()); @@ -537,6 +545,8 @@ public abstract class RSWidgetMixin implements RSWidget @Override public void revalidate() { + assert client.isClientThread(); + client.revalidateWidget(this); } @@ -544,6 +554,8 @@ public abstract class RSWidgetMixin implements RSWidget @Override public void revalidateScroll() { + assert client.isClientThread(); + client.revalidateWidget(this); client.revalidateWidgetScroll(client.getWidgets()[TO_GROUP(this.getId())], this, false); }