mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues Packages Projects Releases Wiki Activity

copy paste

Browse Source
This commit is contained in:
Anuken 2023-09-28 08:52:08 -04:00
parent 8bbf5b1f52
commit 4ed6ed9bcb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/logic/GlobalVars.java
View File

@ -57,7 +57,7 @@ public class GlobalVars{
varWaveTime = put("@waveTime", 0); varWaveTime = put("@waveTime", 0);
varServer = put("@server", 0); varServer = put("@server", 0);
varClient = put("@server", 0); varClient = put("@client", 0);
//special enums //special enums
put("@ctrlProcessor", ctrlProcessor); put("@ctrlProcessor", ctrlProcessor);

4
core/src/mindustry/logic/LExecutor.java
View File

@ -1862,7 +1862,8 @@ public class LExecutor{
if(type == LMarkerControl.remove){ if(type == LMarkerControl.remove){
state.markers.remove(exec.numi(id)); state.markers.remove(exec.numi(id));
}else{ }else{
if(!state.markers.containsKey(exec.numi(id))) return; var marker = state.markers.get(id);
if(marker == null) return;
if(type == LMarkerControl.text){ if(type == LMarkerControl.text){
Call.updateMarkerText(exec.numi(id), type, (exec.obj(p1) != null ? exec.obj(p1).toString() : "null")); 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()); Call.updateMarkerText(exec.numi(id), type, exec.textBuffer.toString());
exec.textBuffer.setLength(0); exec.textBuffer.setLength(0);
}else{ }else{
//TODO this aggressively spams packets to everyone
Call.updateMarker(exec.numi(id), type, exec.num(p1), exec.num(p2), exec.num(p3)); Call.updateMarker(exec.numi(id), type, exec.num(p1), exec.num(p2), exec.num(p3));
} }
} }