Skip to content

Commit f2c5b2d

Browse files
committed
Revert runelite#2530 "Make VarbitChanged only fire once..."
This broke the speccounter plugin, and is moderately incorrect because client scripts can update varbits before a tick has happened, and the event should reflect that.
1 parent 7c48fb1 commit f2c5b2d

File tree

3 files changed

+3
-22
lines changed

3 files changed

+3
-22
lines changed

runelite-api/src/main/java/net/runelite/api/Client.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ public interface Client extends GameEngine
192192
@VisibleForDevtools
193193
void setVarbitValue(int varbit, int value);
194194

195-
boolean shouldPostVarbitEvent();
196-
197195
HashTable getWidgetFlags();
198196

199197
HashTable getComponentTable();

runelite-client/src/main/java/net/runelite/client/callback/Hooks.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
import net.runelite.api.events.PostItemComposition;
6565
import net.runelite.api.events.ProjectileMoved;
6666
import net.runelite.api.events.SetMessage;
67-
import net.runelite.api.events.VarbitChanged;
6867
import net.runelite.api.widgets.Widget;
6968
import static net.runelite.api.widgets.WidgetInfo.WORLD_MAP_VIEW;
7069
import net.runelite.client.Notifier;
@@ -103,7 +102,6 @@ public class Hooks
103102
private static final GameTick tick = new GameTick();
104103
private static final DrawManager renderHooks = injector.getInstance(DrawManager.class);
105104
private static final Notifier notifier = injector.getInstance(Notifier.class);
106-
private static final VarbitChanged varbitChanged = new VarbitChanged();
107105

108106
private static Dimension lastStretchedDimensions;
109107
private static BufferedImage stretchedImage;
@@ -118,11 +116,6 @@ public static void clientMainLoop(Client client, boolean arg1)
118116
{
119117
shouldProcessGameTick = false;
120118

121-
if (client.shouldPostVarbitEvent())
122-
{
123-
eventBus.post(varbitChanged);
124-
}
125-
126119
_deferredEventBus.replay();
127120

128121
eventBus.post(tick);

runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
import net.runelite.api.events.PlayerSpawned;
7979
import net.runelite.api.events.ResizeableChanged;
8080
import net.runelite.api.events.UsernameChanged;
81+
import net.runelite.api.events.VarbitChanged;
8182
import net.runelite.api.events.WidgetLoaded;
8283
import net.runelite.api.mixins.Copy;
8384
import net.runelite.api.mixins.FieldHook;
@@ -135,9 +136,6 @@ public abstract class RSClientMixin implements RSClient
135136
@Inject
136137
private static int inventoryDragDelay;
137138

138-
@Inject
139-
private static boolean hasVarbitChanged;
140-
141139
@Inject
142140
private static int oldMenuEntryCount;
143141

@@ -872,16 +870,8 @@ public static void onGrandExchangeOffersChanged(int idx)
872870
@Inject
873871
public static void settingsChanged(int idx)
874872
{
875-
hasVarbitChanged = true;
876-
}
877-
878-
@Inject
879-
@Override
880-
public boolean shouldPostVarbitEvent()
881-
{
882-
boolean ret = hasVarbitChanged;
883-
hasVarbitChanged = false;
884-
return ret;
873+
VarbitChanged varbitChanged = new VarbitChanged();
874+
eventBus.post(varbitChanged);
885875
}
886876

887877
@FieldHook("isResized")

0 commit comments

Comments
 (0)