mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-03 04:44:24 +07:00
Code Issues 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
Show Stats 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
); );
} }

6
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@ -89,11 +89,11 @@ public class Unloader extends Block{
//sort so it gives priority for blocks that can only either receive or give (not both), and then by load, and then by last use //sort so it gives priority for blocks that can only either receive or give (not both), and then by load, and then by last use
//highest = unload from, lowest = unload to //highest = unload from, lowest = unload to
int unloadPriority = Boolean.compare(x.canUnload && !x.canLoad, y.canUnload && !y.canLoad); //priority to receive if it cannot give int unloadPriority = Boolean.compare(x.canUnload && !x.canLoad, y.canUnload && !y.canLoad); //priority to receive if it cannot give
if (unloadPriority != 0) return unloadPriority; if(unloadPriority != 0) return unloadPriority;
int loadPriority = Boolean.compare(x.canUnload || !x.canLoad, y.canUnload || !y.canLoad); //priority to give if it cannot receive int loadPriority = Boolean.compare(x.canUnload || !x.canLoad, y.canUnload || !y.canLoad); //priority to give if it cannot receive
if (loadPriority != 0) return loadPriority; if(loadPriority != 0) return loadPriority;
int loadFactor = Float.compare(x.loadFactor, y.loadFactor); int loadFactor = Float.compare(x.loadFactor, y.loadFactor);
if (loadFactor != 0) return loadFactor; if(loadFactor != 0) return loadFactor;
return Integer.compare(y.lastUsed, x.lastUsed); //inverted return Integer.compare(y.lastUsed, x.lastUsed); //inverted
}; };