From 7c1d92a9d45e81b60cc7267304f84ae655eaf224 Mon Sep 17 00:00:00 2001 From: chairmanpow Date: Tue, 6 Oct 2026 16:50:30 +0100 Subject: [PATCH] =?UTF-8?q?upstream:=20finish=20the=20picked=20commits'=20?= =?UTF-8?q?build=20=E2=80=94=20drop=20WorldWriter::sent,=20add=20set=5Fene?= =?UTF-8?q?my=5Fplates?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crates/benilla-app/src/capture/fixtures.rs | 12 ++++++++++++ crates/benilla-protocol/src/world/writer/mod.rs | 3 --- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/crates/benilla-app/src/capture/fixtures.rs b/crates/benilla-app/src/capture/fixtures.rs index e089ae53..1fb7f600 100644 --- a/crates/benilla-app/src/capture/fixtures.rs +++ b/crates/benilla-app/src/capture/fixtures.rs @@ -1485,6 +1485,18 @@ pub(super) fn seed_ui_fixture( } } +/// Turn the enemy nameplates on or off through the stock `NAMEPLATES_ON` global. +fn set_enemy_plates(script: Option<&benilla_ui::script::UiScript>, on: bool) { + let lua = if on { + "NAMEPLATES_ON = 1; ShowNameplates()" + } else { + "NAMEPLATES_ON = nil; HideNameplates()" + }; + if let Some(Err(e)) = script.map(|s| s.run(lua)) { + warn!("nameplates: {e}"); + } +} + /// The `GetTime()` the cooldown filmstrip pins the VM's session clock at, seconds. Large, as /// `CooldownFrame_SetTimer` ignores a start not above 0 (`Cooldown.lua:2`) and the starts here /// are `now - fraction * span`. diff --git a/crates/benilla-protocol/src/world/writer/mod.rs b/crates/benilla-protocol/src/world/writer/mod.rs index f7e96565..c34a89ad 100644 --- a/crates/benilla-protocol/src/world/writer/mod.rs +++ b/crates/benilla-protocol/src/world/writer/mod.rs @@ -60,9 +60,6 @@ mod vendor; pub struct WorldWriter { pub(super) stream: TcpStream, pub(super) encrypter: EncrypterHalf, - /// Every packet that reached the socket since the last drain, as `(opcode, body length)`; - /// `None` until [`Self::watch_sends`]. Pushed only after a successful write. - pub(super) sent: Option>, /// The character's faction language, set at login from its race, which a chat send naming no /// language carries. vmangos drops the whole message, dot-commands included, when the /// character does not know the language.