mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 06:22:17 -08:00
Code Issues Projects Releases Wiki Activity

Switched to v7 server list

Browse source
This commit is contained in:
Anuken 2021-06-24 17:58:26 -04:00
parent 5af6e8c5de
commit bdeba22561
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/src/mindustry/Vars.java
View file

@ -73,8 +73,8 @@ public class Vars implements Loadable{
/** URL to the JSON file containing all the BE servers. Only queried in BE. */
public static final String serverJsonBeURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
/** URL to the JSON file containing all the stable servers. */
//TODO this uses BE servers until full v7 release, there's no point in displaying v6 at all
public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_be.json";
//TODO merge with v6 list upon release
public static final String serverJsonURL = "https://raw.githubusercontent.com/Anuken/Mindustry/master/servers_v7.json";
/** URL of the github issue report template.*/
public static final String reportIssueURL = "https://github.com/Anuken/Mindustry/issues/new?labels=bug&template=bug_report.md";
/** list of built-in servers.*/

3
core/src/mindustry/world/blocks/payloads/PayloadSource.java
View file

@ -12,6 +12,7 @@ import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.*;
import mindustry.world.blocks.*;
import mindustry.world.blocks.storage.*;
import static mindustry.Vars.*;
@ -69,7 +70,7 @@ public class PayloadSource extends PayloadBlock{
}
public boolean canProduce(Block b){
return b.isVisible() && b.size < size;
return b.isVisible() && b.size < size && !(b instanceof CoreBlock);
}
public boolean canProduce(UnitType t){