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

Merge branch 'master' into patch-2

Browse Source
This commit is contained in:
Anuken
2020-09-16 09:51:05 -04:00
committed by GitHub
parent de610c839a 5b6da6039f
commit b200b198ed
5 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/core/NetServer.java
+5 -5
View File
@@ -593,11 +593,6 @@ public class NetServer implements ApplicationListener{
if(player.isBuilder()){ if(player.isBuilder()){
player.builder().clearBuilding(); player.builder().clearBuilding();
player.builder().updateBuilding(building); player.builder().updateBuilding(building);
}
if(player.isMiner()){
player.miner().mineTile(mining);
}
if(requests != null){ if(requests != null){
for(BuildPlan req : requests){ for(BuildPlan req : requests){
@@ -624,6 +619,11 @@ public class NetServer implements ApplicationListener{
player.builder().plans().addLast(req); player.builder().plans().addLast(req);
} }
} }
}
if(player.isMiner()){
player.miner().mineTile(mining);
}
con.rejectedRequests.clear(); con.rejectedRequests.clear();
core/src/mindustry/graphics/FloorRenderer.java
+1 -1
View File
@@ -228,7 +228,7 @@ public class FloorRenderer implements Disposable{
int chunksx = Mathf.ceil((float)(world.width()) / chunksize), int chunksx = Mathf.ceil((float)(world.width()) / chunksize),
chunksy = Mathf.ceil((float)(world.height()) / chunksize); chunksy = Mathf.ceil((float)(world.height()) / chunksize);
cache = new Chunk[chunksx][chunksy]; cache = new Chunk[chunksx][chunksy];
cbatch = new MultiCacheBatch(chunksize * chunksize * 6); cbatch = new MultiCacheBatch(chunksize * chunksize * 7);
Time.mark(); Time.mark();
core/src/mindustry/maps/filters/FilterOption.java
+6 -6
View File
@@ -17,13 +17,13 @@ import mindustry.world.blocks.environment.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
public abstract class FilterOption{ public abstract class FilterOption{
public static final Boolf<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)); public static final Boolf<Block> floorsOnly = b -> (b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full));
public static final Boolf<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)); public static final Boolf<Block> wallsOnly = b -> (!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full)) && b.inEditor;
public static final Boolf<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full))); public static final Boolf<Block> floorsOptional = b -> b == Blocks.air || ((b instanceof Floor && !(b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full)));
public static final Boolf<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full))); public static final Boolf<Block> wallsOptional = b -> b == Blocks.air || ((!b.synthetic() && !(b instanceof Floor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full)));
public static final Boolf<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full))); public static final Boolf<Block> wallsOresOptional = b -> b == Blocks.air || (((!b.synthetic() && !(b instanceof Floor)) || (b instanceof OverlayFloor)) && !headless && Core.atlas.isFound(b.icon(Cicon.full))) && b.inEditor;
public static final Boolf<Block> oresOnly = b -> b instanceof OverlayFloor && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full)); public static final Boolf<Block> oresOnly = b -> b instanceof OverlayFloor && !headless && Core.atlas.isFound(b.icon(mindustry.ui.Cicon.full));
public static final Boolf<Block> anyOptional = b -> floorsOnly.get(b) || wallsOnly.get(b) || oresOnly.get(b) || b == Blocks.air; public static final Boolf<Block> anyOptional = b -> (floorsOnly.get(b) || wallsOnly.get(b) || oresOnly.get(b) || b == Blocks.air) && b.inEditor;
public abstract void build(Table table); public abstract void build(Table table);
servers_be.json
-6
View File
@@ -4,11 +4,5 @@
}, },
{ {
"address": "nydustry.nydus.app:6060" "address": "nydustry.nydus.app:6060"
},
{
"address": "mindustry.pl:6000"
},
{
"address": "mindustry.pl:6666"
} }
] ]
servers_v6.json
+6
View File
@@ -1,4 +1,10 @@
[ [
{
"address": "mindustry.pl:6000"
},
{
"address": "mindustry.pl:6666"
},
{ {
"address": "routerchain.ddns.net" "address": "routerchain.ddns.net"
} }