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

Disperse turret mostly done

Browse Source
This commit is contained in:
Anuken
2022-02-12 10:20:37 -05:00
parent e8c277d7b8
commit b079955b52
16 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -462,16 +462,15 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
player.justSwitchTo = unit;
}
//TODO range check for docking
//TODO range check for docking?
var before = player.unit();
player.unit(unit);
//TODO test this in multiplayer
if(unit.type.coreUnitDock && before != null && !before.isNull()){
if(before != null && !before.isNull()){
if(before.spawnedByCore){
unit.dockedType = before.type;
}else if(before.dockedType != null){
}else if(before.dockedType != null && before.dockedType.coreUnitDock){
//direct dock transfer???
unit.dockedType = before.dockedType;
}
@@ -494,7 +493,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
if(player == null) return;
//TODO test this in multiplayer
if(!player.dead() && player.unit().type.coreUnitDock && !player.unit().spawnedByCore){
if(!player.dead() && !player.unit().spawnedByCore && player.unit().dockedType != null && player.unit().dockedType.coreUnitDock){
//TODO respawn ON the unit, with an animation?
var docked = player.unit().dockedType;
if(docked == null){