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

Allow derelict block pickup / Fixed derelict blocks being targeted

Browse Source
This commit is contained in:
Anuken
2021-07-24 08:44:43 -04:00
parent b88364ab48
commit 9160ee546c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -306,7 +306,7 @@ public class BlockIndexer{
for(int i = 0; i < activeTeams.size; i++){ for(int i = 0; i < activeTeams.size; i++){
Team enemy = activeTeams.items[i]; Team enemy = activeTeams.items[i];
if(enemy == team || (team == Team.derelict && !state.rules.coreCapture)) continue; if(enemy == team || (enemy == Team.derelict && !state.rules.coreCapture)) continue;
Building candidate = indexer.findTile(enemy, x, y, range, pred, true); Building candidate = indexer.findTile(enemy, x, y, range, pred, true);
if(candidate == null) continue; if(candidate == null) continue;

4
core/src/mindustry/input/InputHandler.java
View File

@@ -230,7 +230,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
Unit unit = player.unit(); Unit unit = player.unit();
if(build != null && build.team == unit.team if(build != null && state.teams.canInteract(unit.team, build.team)
&& unit.within(build, tilesize * build.block.size * 1.2f + tilesize * 5f)){ && unit.within(build, tilesize * build.block.size * 1.2f + tilesize * 5f)){
//pick up block's payload //pick up block's payload
@@ -510,7 +510,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
}else{ }else{
Building build = world.buildWorld(pay.x(), pay.y()); Building build = world.buildWorld(pay.x(), pay.y());
if(build != null && build.team == unit.team){ if(build != null && state.teams.canInteract(unit.team, build.team)){
Call.requestBuildPayload(player, build); Call.requestBuildPayload(player, build);
} }
} }