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

Fixed #2567

Browse Source
This commit is contained in:
Anuken
2020-09-16 12:56:32 -04:00
parent ddcfd0728d
commit 47b4da59e0
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/editor/EditorTile.java
View File

@@ -46,6 +46,8 @@ public class EditorTile extends Tile{
return; return;
} }
if(this.block == type && (build == null || build.rotation == rotation)) return;
if(rotation != 0) op(OpType.rotation, (byte)rotation); if(rotation != 0) op(OpType.rotation, (byte)rotation);
if(team() != Team.derelict) op(OpType.team, (byte)team().id); if(team() != Team.derelict) op(OpType.team, (byte)team().id);
op(OpType.block, block.id); op(OpType.block, block.id);

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

@@ -236,7 +236,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
@Remote(targets = Loc.both, forward = true, called = Loc.server) @Remote(targets = Loc.both, forward = true, called = Loc.server)
public static void transferInventory(Player player, Building tile){ public static void transferInventory(Player player, Building tile){
if(player == null || tile == null || !player.within(tile, buildingRange)) return; if(player == null || tile == null || !player.within(tile, buildingRange) || tile.items == null) return;
if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) || if(net.server() && (player.unit().stack.amount <= 0 || !Units.canInteract(player, tile) ||
!netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> { !netServer.admins.allowAction(player, ActionType.depositItem, tile.tile, action -> {

2
core/src/mindustry/world/blocks/units/Reconstructor.java
View File

@@ -140,7 +140,7 @@ public class Reconstructor extends UnitBlock{
if(moveInPayload()){ if(moveInPayload()){
if(consValid()){ if(consValid()){
valid = true; valid = true;
progress += edelta(); progress += edelta() * state.rules.unitBuildSpeedMultiplier;
} }
//upgrade the unit //upgrade the unit