From 2f4a9462eae22b2d797b7fffa4508c204a866e93 Mon Sep 17 00:00:00 2001
From: Martin Michelsen <fuzziqersoftware+g@gmail.com>
Date: Fri, 1 May 2026 21:56:16 -0700
Subject: [PATCH] fix 6x17 filter in proxy

---
 src/ProxyCommands.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ProxyCommands.cc b/src/ProxyCommands.cc
index 70ed72a8..41f86c05 100644
--- a/src/ProxyCommands.cc
+++ b/src/ProxyCommands.cc
@@ -1023,8 +1023,8 @@ static asio::awaitable<HandlerResult> S_6x(shared_ptr<Client> c, Channel::Messag
 
     case 0x17: {
       const auto& cmd = msg.check_size_t<G_SetEntityPositionAndAngle_6x17>();
-      if (cmd.header.entity_id == c->lobby_client_id) {
-        c->log.warning_f("Blocking subcommand 6x17 targeting local client");
+      if ((cmd.header.entity_id == c->lobby_client_id) && (c->floor != 0x0D)) {
+        c->log.warning_f("Blocking subcommand 6x17 targeting local client on incorrect floor");
         co_return HandlerResult::SUPPRESS;
       }
       break;