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

Cleanup

Browse Source
This commit is contained in:
Anuken
2020-06-08 17:31:02 -04:00
parent 5be5d11c8e
commit 6dd9369066
35 changed files with 121 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/mod/ContentParser.java
View File

@@ -536,7 +536,7 @@ public class ContentParser{
private void checkNullFields(Object object){
if(object instanceof Number || object instanceof String || toBeParsed.contains(object)) return;
parser.getFields(object.getClass()).values().toArray().each(field -> {
parser.getFields(object.getClass()).values().toSeq().each(field -> {
try{
if(field.field.getType().isPrimitive()) return;

2
core/src/mindustry/net/Administration.java
View File

@@ -414,7 +414,7 @@ public class Administration{
}
public Seq<PlayerInfo> getWhitelisted(){
return playerInfo.values().toArray().select(p -> isWhitelisted(p.id, p.adminUsid));
return playerInfo.values().toSeq().select(p -> isWhitelisted(p.id, p.adminUsid));
}
private PlayerInfo getCreateInfo(String id){

2
core/src/mindustry/world/meta/BlockBars.java
View File

@@ -14,7 +14,7 @@ public class BlockBars{
public void remove(String name){
if(!bars.containsKey(name))
throw new RuntimeException("No bar with name '" + name + "' found; current bars: " + bars.keys().toArray());
throw new RuntimeException("No bar with name '" + name + "' found; current bars: " + bars.keys().toSeq());
bars.remove(name);
}