Merged alpha and dart mech pads / Differential gen / Fixed optional display

This commit is contained in:
Anuken
2019-02-02 17:39:46 -05:00
parent 696e6cb84b
commit 8e8e95cd2d
22 changed files with 1430 additions and 1442 deletions

View File

@@ -36,7 +36,6 @@ import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Block.Icon;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Floor;
import io.anuke.mindustry.world.blocks.storage.CoreBlock.CoreEntity;
import java.io.DataInput;
import java.io.DataOutput;
@@ -255,15 +254,6 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
return "Player{" + id + ", mech=" + mech.name + ", local=" + isLocal + ", " + x + ", " + y + "}";
}
@Override
public void removed(){
TileEntity core = getClosestCore();
if(core != null && ((CoreEntity) core).currentUnit == this){
((CoreEntity) core).currentUnit = null;
}
}
@Override
public EntityGroup targetGroup(){
return playerGroup;