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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-05-27 18:23:20 -04:00
parent 49c7984c8c
commit 55f0aa6d3b
23 changed files with 50 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/mindustry/entities/comp/PayloadComp.java
View File

@@ -3,6 +3,7 @@ package mindustry.entities.comp;
import arc.math.*;
import arc.struct.*;
import arc.util.*;
import mindustry.*;
import mindustry.annotations.Annotations.*;
import mindustry.content.*;
import mindustry.gen.*;
@@ -12,6 +13,8 @@ import mindustry.world.blocks.payloads.*;
/** An entity that holds a payload. */
@Component
abstract class PayloadComp implements Posc, Rotc{
@Import float x, y;
Array<Payload> payloads = new Array<>();
boolean hasPayload(){
@@ -76,11 +79,11 @@ abstract class PayloadComp implements Posc, Rotc{
/** @return whether the tile has been successfully placed. */
boolean dropBlock(BlockPayload payload){
Tilec tile = payload.entity;
int tx = tileX(), ty = tileY();
Tile on = tileOn();
if(Build.validPlace(tile.team(), tx, ty, tile.block(), tile.rotation())){
int tx = Vars.world.toTile(x - tile.block().offset()), ty = Vars.world.toTile(y - tile.block().offset());
Tile on = Vars.world.tile(tx, ty);
if(on != null && Build.validPlace(tile.team(), tx, ty, tile.block(), tile.rotation())){
int rot = (int)((rotation() + 45f) / 90f) % 4;
payload.place(tileOn(), rot);
payload.place(on, rot);
Fx.unitDrop.at(tile);
Fx.placeBlock.at(on.drawx(), on.drawy(), on.block().size);

3
core/src/mindustry/input/DesktopInput.java
View File

@@ -25,6 +25,7 @@ import mindustry.gen.*;
import mindustry.graphics.*;
import mindustry.ui.*;
import mindustry.world.*;
import mindustry.world.meta.*;
import static arc.Core.scene;
import static mindustry.Vars.*;
@@ -617,7 +618,7 @@ public class DesktopInput extends InputHandler{
pay.pickup(target);
}else if(!pay.hasPayload()){
Tilec tile = world.entWorld(pay.x(), pay.y());
if(tile != null && tile.team() == unit.team()){
if(tile != null && tile.team() == unit.team() && tile.block().synthetic() && tile.block().buildVisibility != BuildVisibility.hidden && tile.block().size <= 3){
pay.pickup(tile);
}
}