don't update wrong types

melkypie · Jun 11, 2024 · 0eb38f9 · 0eb38f9
1 parent 632f409
commit 0eb38f9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/main/java/melky/resourcepacks/ResourcePacksManager.java b/src/main/java/melky/resourcepacks/ResourcePacksManager.java
@@ -831,9 +831,6 @@ public void resetWidgetOverrides()
 
 	public void addPropertyToWidget(WidgetOverride widgetOverride, boolean reset)
 	{
-		int oldColor = widgetOverride.getColor();
-		int newColor = widgetOverride.getNewColor();
-
 		Widget widgetToOverride = client.getWidget(widgetOverride.getInterfaceId(), widgetOverride.getChildId());
 		if (widgetToOverride == null)
 		{
@@ -886,7 +883,8 @@ private void applyWidgetProperties(Widget widget, WidgetOverride widgetOverride,
 			return;
 		}
 
-		if (widget.getTextColor() == newColor || !widgetOverride.checkVarbit(client))
+		if (widget.getTextColor() == newColor || !widgetOverride.checkVarbit(client) ||
+			(widgetOverride.getType() > -1 && (widget.getType() != widgetOverride.getType() && widgetOverride.getNewType() != widget.getType())))
 		{
 			return;
 		}
@@ -900,6 +898,7 @@ private void applyWidgetProperties(Widget widget, WidgetOverride widgetOverride,
 
 		if (widgetOverride.getNewType() > -1)
 		{
+			log.debug("{} overriding widget type {} to {}", widget.getId(), widget.getType(), widgetOverride.getNewType());
 			widget.setType(widgetOverride.getNewType());
 			if (widgetOverride.getNewType() == 3)
 			{