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

Fixed #7628

Browse Source
This commit is contained in:
Anuken
2022-09-26 10:56:10 -04:00
parent edaa0652bd
commit dec2642434
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/game/Team.java
View File

@@ -107,7 +107,7 @@ public class Team implements Comparable<Team>{
/** @return whether this team is supposed to be AI-controlled. */ /** @return whether this team is supposed to be AI-controlled. */
public boolean isAI(){ public boolean isAI(){
return (state.rules.waves || state.rules.attackMode) && this == state.rules.waveTeam && !state.rules.pvp; return (state.rules.waves || state.rules.attackMode) && this != state.rules.defaultTeam && !state.rules.pvp;
} }
/** @return whether this team is solely comprised of AI (with no players possible). */ /** @return whether this team is solely comprised of AI (with no players possible). */

2
core/src/mindustry/world/blocks/distribution/Duct.java
View File

@@ -179,7 +179,7 @@ public class Duct extends Block implements Autotiler{
((source.block.rotate && source.front() == this && source.block.hasItems && source.block.isDuct) || ((source.block.rotate && source.front() == this && source.block.hasItems && source.block.isDuct) ||
Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation) : Edges.getFacingEdge(source.tile(), tile).relativeTo(tile) == rotation) :
//standard acceptance - do not accept from front //standard acceptance - do not accept from front
!(source.block.rotate && next == source) && Math.abs(Edges.getFacingEdge(source.tile, tile).relativeTo(tile.x, tile.y) - rotation) != 2 !(source.block.rotate && next == source) && Edges.getFacingEdge(source.tile, tile) != null && Math.abs(Edges.getFacingEdge(source.tile, tile).relativeTo(tile.x, tile.y) - rotation) != 2
); );
} }