From 4ed6ed9bcbd22f35d0c43f881ffe8f60e1de1fe2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 28 Sep 2023 08:52:08 -0400
Subject: [PATCH] copy paste

---
 core/src/mindustry/logic/GlobalVars.java | 2 +-
 core/src/mindustry/logic/LExecutor.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/logic/GlobalVars.java b/core/src/mindustry/logic/GlobalVars.java
index ca0bead619..d5aa10a2fc 100644
--- a/core/src/mindustry/logic/GlobalVars.java
+++ b/core/src/mindustry/logic/GlobalVars.java
@@ -57,7 +57,7 @@ public class GlobalVars{
         varWaveTime = put("@waveTime", 0);
 
         varServer = put("@server", 0);
-        varClient = put("@server", 0);
+        varClient = put("@client", 0);
 
         //special enums
         put("@ctrlProcessor", ctrlProcessor);
diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index e51d603287..2c45d4ad5f 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -1862,7 +1862,8 @@ public class LExecutor{
             if(type == LMarkerControl.remove){
                 state.markers.remove(exec.numi(id));
             }else{
-                if(!state.markers.containsKey(exec.numi(id))) return;
+                var marker = state.markers.get(id);
+                if(marker == null) return;
 
                 if(type == LMarkerControl.text){
                     Call.updateMarkerText(exec.numi(id), type, (exec.obj(p1) != null ? exec.obj(p1).toString() : "null"));
@@ -1870,6 +1871,7 @@ public class LExecutor{
                     Call.updateMarkerText(exec.numi(id), type, exec.textBuffer.toString());
                     exec.textBuffer.setLength(0);
                 }else{
+                    //TODO this aggressively spams packets to everyone
                     Call.updateMarker(exec.numi(id), type, exec.num(p1), exec.num(p2), exec.num(p3));
                 }
             }