Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse Source
This commit is contained in:
Anuken
2024-08-16 16:00:51 -04:00
parent 8e8b99d421 f347dc4c84
commit 44ec8c5e0e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class LAssembler{
/** @return a variable by name. /** @return a variable by name.
* This may be a constant variable referring to a number or object. */ * This may be a constant variable referring to a number or object. */
public LVar var(String symbol){ public LVar var(String symbol){
LVar constVar = Vars.logicVars.get(symbol); LVar constVar = Vars.logicVars.get(symbol, privileged);
if(constVar != null) return constVar; if(constVar != null) return constVar;
symbol = symbol.trim(); symbol = symbol.trim();

4
servers_v7.json
View File

@@ -73,7 +73,7 @@
}, },
{ {
"name": "SMoke of Anarchy", "name": "SMoke of Anarchy",
"address": ["86.102.97.27"] "address": ["mindustry.smokeofanarchy.ru", "mindustry.smokeofanarchy.ru:6568", "mindustry.smokeofanarchy.ru:6569", "mindustry.smokeofanarchy.ru:6570", "mindustry.smokeofanarchy.ru:6571", "mindustry.smokeofanarchy.ru:6572", "mindustry.smokeofanarchy.ru:6573", "mindustry.smokeofanarchy.ru:6574", "mindustry.smokeofanarchy.ru:6575", "mindustry.smokeofanarchy.ru:6576"]
}, },
{ {
"name": "Mindustry.pl", "name": "Mindustry.pl",
@@ -246,7 +246,7 @@
}, },
{ {
"name": "abcxyz remaster", "name": "abcxyz remaster",
"address": ["144.76.57.59:30302", "23.88.73.88:16895"] "address": ["144.76.57.59:35150", "23.88.73.88:11066", "23.88.73.88:9171", "23.88.73.88:10911"]
}, },
{ {
"name": "CroCraft Network", "name": "CroCraft Network",