diff --git a/SERVERLIST.md b/SERVERLIST.md index 659daddfb8..58e717fb01 100644 --- a/SERVERLIST.md +++ b/SERVERLIST.md @@ -13,8 +13,9 @@ You'll need to either hire some moderators, or make use of (currently non-existe Since new players may be exposed to the server list early on, put in a phrase like "Co-op survival" or "PvP" so players know what they're getting into. Yes, this is also displayed in the server mode info text, but having extra info in the name doesn't hurt. - Make sure players know where to refer to for server support. It should be fairly clear that the server owner is not me, but you. - Try to be professional in your text; use common sense. -3. **Get some good maps** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option. -4. Finally, **submit a pull request** to add your server's IP to the list. +3. **Get some good maps.** *(optional, but highly recommended)*. Add some maps to your server and set the map rotation to custom-only. You can get maps from the Steam workshop by subscribing and exporting them; using the `#maps` channel on Discord is also an option. +4. **Check your server configuration.** *(optional)* I would recommend adding a message rate limit of 1 second (`config messageRateLimit 1`), and disabling connect/disconnect messages to reduce spam (`config showConnectMessages false`). +5. Finally, **submit a pull request** to add your server's IP to the list. This should be fairly straightforward: Press the edit button on the [server file](https://github.com/Anuken/Mindustry/blob/master/servers.json), then add a JSON object with a single key, indicating your server address. For example, if your server address is `google.com`, you would add a comma after the last entry and insert: ```json diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index a16ac8f410..b40e3543da 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -33,8 +33,7 @@ public class Pathfinder implements Runnable{ /** handles task scheduling on the update thread. */ private TaskQueue queue = new TaskQueue(); /** current pathfinding thread */ - private @Nullable - Thread thread; + private @Nullable Thread thread; public Pathfinder(){ Events.on(WorldLoadEvent.class, event -> { diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index e4c7aa2c05..62479c66ec 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -17,6 +17,10 @@ public class Teams{ /** Active teams. */ private Array active = new Array<>(); + public Teams(){ + active.add(get(Team.crux)); + } + public @Nullable CoreEntity closestEnemyCore(float x, float y, Team team){ for(TeamData data : active){ if(areEnemies(team, data.team)){ @@ -85,7 +89,6 @@ public class Teams{ /** Returns whether {@param other} is an enemy of {@param #team}. */ public boolean areEnemies(Team team, Team other){ - //todo what about derelict? return team != other; } diff --git a/servers.json b/servers.json index 8812eee20f..cada39c4c8 100644 --- a/servers.json +++ b/servers.json @@ -7,5 +7,8 @@ }, { "address": "mindustry.ecansol.com:6499" + }, + { + "address": "mindustry.ru" } ]