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

Many various internal changes

Browse Source
This commit is contained in:
Anuken
2019-12-26 17:46:01 -05:00
parent 36ec88e2e2
commit de5979f4ee
53 changed files with 435 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/mindustry/server/ServerControl.java
View File

@@ -292,7 +292,7 @@ public class ServerControl implements ApplicationListener{
info(" &lyPlaying on map &fi{0}&fb &lb/&ly Wave {1}", Strings.capitalize(world.getMap().name()), state.wave);
if(state.rules.waves){
info("&ly {0} enemies.", unitGroups[(int) Team.crux.id].size());
info("&ly {0} enemies.", unitGroups[(int)Team.crux.id].size());
}else{
info("&ly {0} seconds until next wave.", (int)(state.wavetime / 60));
}
@@ -421,14 +421,14 @@ public class ServerControl implements ApplicationListener{
try{
Team team = arg.length == 0 ? Team.sharded : Team.valueOf(arg[0]);
if(state.teams.get(team).cores.isEmpty()){
if(state.teams.cores(team).isEmpty()){
err("That team has no cores.");
return;
}
for(Item item : content.items()){
if(item.type == ItemType.material){
state.teams.get(team).cores.first().entity.items.set(item, state.teams.get(team).cores.first().block().itemCapacity);
state.teams.cores(team).first().entity.items.set(item, state.teams.cores(team).first().block().itemCapacity);
}
}