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

Fixed server

Browse Source
This commit is contained in:
Anuken
2020-02-09 15:40:03 -05:00
parent ae7a8e1f65
commit d89189debd
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/mindustry/maps/planet/TestPlanetGenerator.java
View File

@@ -18,10 +18,11 @@ public class TestPlanetGenerator implements PlanetGenerator{
Array<Block> blocks = Array.with(Blocks.sporeMoss, Blocks.moss, Blocks.ice, Blocks.snow, Blocks.sand, Blocks.darksand, Blocks.darksandWater, Blocks.darksandTaintedWater, Blocks.iceSnow); Array<Block> blocks = Array.with(Blocks.sporeMoss, Blocks.moss, Blocks.ice, Blocks.snow, Blocks.sand, Blocks.darksand, Blocks.darksandWater, Blocks.darksandTaintedWater, Blocks.iceSnow);
public TestPlanetGenerator(){ public TestPlanetGenerator(){
//TODO remove planet pixmap
try{ try{
pix = new Pixmap("planets/colors.png"); pix = new Pixmap("planets/colors.png");
water = waterLevel / (float)(pix.getHeight()); water = waterLevel / (float)(pix.getHeight());
}catch(Exception ignored){ }catch(Throwable ignored){
//ignored during headless loading for now //ignored during headless loading for now
} }
} }

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

@@ -14,10 +14,8 @@ import arc.util.serialization.JsonValue.*;
import mindustry.*; import mindustry.*;
import mindustry.core.GameState.*; import mindustry.core.GameState.*;
import mindustry.core.*; import mindustry.core.*;
import mindustry.entities.*;
import mindustry.entities.type.Playerc;
import mindustry.game.*;
import mindustry.game.EventType.*; import mindustry.game.EventType.*;
import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.io.*; import mindustry.io.*;
import mindustry.maps.Map; import mindustry.maps.Map;
@@ -84,8 +82,6 @@ public class ServerControl implements ApplicationListener{
}); });
Time.setDeltaProvider(() -> Core.graphics.getDeltaTime() * 60f); Time.setDeltaProvider(() -> Core.graphics.getDeltaTime() * 60f);
Effects.setScreenShakeProvider((a, b) -> {});
Effects.setEffectProvider((a, b, c, d, e, f) -> {});
registerCommands(); registerCommands();
@@ -133,9 +129,9 @@ public class ServerControl implements ApplicationListener{
Events.on(GameOverEvent.class, event -> { Events.on(GameOverEvent.class, event -> {
if(inExtraRound) return; if(inExtraRound) return;
if(state.rules.waves){ if(state.rules.waves){
info("&lcGame over! Reached wave &ly{0}&lc with &ly{1}&lc players online on map &ly{2}&lc.", state.wave, playerGroup.size(), Strings.capitalize(world.getMap().name())); info("&lcGame over! Reached wave &ly{0}&lc with &ly{1}&lc players online on map &ly{2}&lc.", state.wave, Groups.player.size(), Strings.capitalize(world.getMap().name()));
}else{ }else{
info("&lcGame over! Team &ly{0}&lc is victorious with &ly{1}&lc players online on map &ly{2}&lc.", event.winner.name, playerGroup.size(), Strings.capitalize(world.getMap().name())); info("&lcGame over! Team &ly{0}&lc is victorious with &ly{1}&lc players online on map &ly{2}&lc.", event.winner.name, Groups.player.size(), Strings.capitalize(world.getMap().name()));
} }
//set next map to be played //set next map to be played
@@ -294,10 +290,10 @@ public class ServerControl implements ApplicationListener{
info(" &ly{0} FPS, {1} MB used.", Core.graphics.getFramesPerSecond(), Core.app.getJavaHeap() / 1024 / 1024); info(" &ly{0} FPS, {1} MB used.", Core.graphics.getFramesPerSecond(), Core.app.getJavaHeap() / 1024 / 1024);
if(playerGroup.size() > 0){ if(Groups.player.size() > 0){
info(" &lyPlayers: {0}", playerGroup.size()); info(" &lyPlayers: {0}", Groups.player.size());
for(Playerc p : playerGroup.all()){ for(Playerc p : Groups.player){
info(" &y{0} / {1}", p.name, p.uuid); info(" &y{0} / {1}", p.name(), p.uuid());
} }
}else{ }else{
info(" &lyNo players connected."); info(" &lyNo players connected.");
@@ -418,7 +414,7 @@ public class ServerControl implements ApplicationListener{
for(Item item : content.items()){ for(Item item : content.items()){
if(item.type == ItemType.material){ if(item.type == ItemType.material){
state.teams.cores(team).first().items.set(item, state.teams.cores(team).first().block.itemCapacity); state.teams.cores(team).first().items().set(item, state.teams.cores(team).first().block().itemCapacity);
} }
} }
@@ -576,11 +572,11 @@ public class ServerControl implements ApplicationListener{
return; return;
} }
Playerc target = playerGroup.find(p -> p.name.equals(arg[0])); Playerc target = Groups.player.find(p -> p.name().equals(arg[0]));
if(target != null){ if(target != null){
Call.sendMessage("[scarlet] " + target.name + "[scarlet] has been kicked by the server."); Call.sendMessage("[scarlet] " + target.name() + "[scarlet] has been kicked by the server.");
target.con.kick(KickReason.kick); target.kick(KickReason.kick);
info("It is done."); info("It is done.");
}else{ }else{
info("Nobody with that name could be found..."); info("Nobody with that name could be found...");
@@ -592,9 +588,9 @@ public class ServerControl implements ApplicationListener{
netServer.admins.banPlayerID(arg[1]); netServer.admins.banPlayerID(arg[1]);
info("Banned."); info("Banned.");
}else if(arg[0].equals("name")){ }else if(arg[0].equals("name")){
Playerc target = playerGroup.find(p -> p.name.equalsIgnoreCase(arg[1])); Playerc target = Groups.player.find(p -> p.name().equalsIgnoreCase(arg[1]));
if(target != null){ if(target != null){
netServer.admins.banPlayer(target.uuid); netServer.admins.banPlayer(target.uuid());
info("Banned."); info("Banned.");
}else{ }else{
err("No matches found."); err("No matches found.");
@@ -606,10 +602,10 @@ public class ServerControl implements ApplicationListener{
err("Invalid type."); err("Invalid type.");
} }
for(Playerc player : playerGroup.all()){ for(Playerc player : Groups.player){
if(netServer.admins.isIDBanned(player.uuid)){ if(netServer.admins.isIDBanned(player.uuid())){
Call.sendMessage("[scarlet] " + player.name + " has been banned."); Call.sendMessage("[scarlet] " + player.name() + " has been banned.");
player.con.kick(KickReason.banned); player.con().kick(KickReason.banned);
} }
} }
}); });
@@ -657,11 +653,11 @@ public class ServerControl implements ApplicationListener{
return; return;
} }
Playerc target = playerGroup.find(p -> p.name.equals(arg[0])); Playerc target = Groups.player.find(p -> p.name().equals(arg[0]));
if(target != null){ if(target != null){
netServer.admins.adminPlayer(target.uuid, target.usid); netServer.admins.adminPlayer(target.uuid(), target.usid());
target.isAdmin = true; target.admin(true);
info("Admin-ed player: {0}", arg[0]); info("Admin-ed player: {0}", arg[0]);
}else{ }else{
info("Nobody with that name could be found."); info("Nobody with that name could be found.");
@@ -674,11 +670,11 @@ public class ServerControl implements ApplicationListener{
return; return;
} }
Playerc target = playerGroup.find(p -> p.name.equals(arg[0])); Playerc target = Groups.player.find(p -> p.name().equals(arg[0]));
if(target != null){ if(target != null){
netServer.admins.unAdminPlayer(target.uuid); netServer.admins.unAdminPlayer(target.uuid());
target.isAdmin = false; target.admin(false);
info("Un-admin-ed player: {0}", arg[0]); info("Un-admin-ed player: {0}", arg[0]);
}else{ }else{
info("Nobody with that name could be found."); info("Nobody with that name could be found.");
@@ -855,9 +851,9 @@ public class ServerControl implements ApplicationListener{
inExtraRound = true; inExtraRound = true;
Runnable r = () -> { Runnable r = () -> {
Array<Playerc> players = new Array<>(); Array<Playerc> players = new Array<>();
for(Playerc p : playerGroup.all()){ for(Playerc p : Groups.player){
players.add(p); players.add(p);
p.dead(true); p.clearUnit();
} }
logic.reset(); logic.reset();
@@ -868,7 +864,7 @@ public class ServerControl implements ApplicationListener{
logic.play(); logic.play();
for(Playerc p : players){ for(Playerc p : players){
if(p.con == null) continue; if(p.con() == null) continue;
p.reset(); p.reset();
if(state.rules.pvp){ if(state.rules.pvp){