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

Risky building changes

Browse Source
This commit is contained in:
Anuken
2019-04-02 14:26:23 -04:00
parent 66dc1e94f5
commit 37999e0870
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
+2 -3
View File
@@ -202,9 +202,9 @@ public interface BuilderTrait extends Entity, TeamTrait{
if(!(tile.block() instanceof BuildBlock)){ if(!(tile.block() instanceof BuildBlock)){
if(canCreateBlocks() && !current.breaking && Build.validPlace(getTeam(), current.x, current.y, current.block, current.rotation)){ if(canCreateBlocks() && !current.breaking && Build.validPlace(getTeam(), current.x, current.y, current.block, current.rotation)){
Build.beginPlace(getTeam(), current.x, current.y, current.block, current.rotation); Call.beginPlace(getTeam(), current.x, current.y, current.block, current.rotation);
}else if(canCreateBlocks() && current.breaking && Build.validBreak(getTeam(), current.x, current.y)){ }else if(canCreateBlocks() && current.breaking && Build.validBreak(getTeam(), current.x, current.y)){
Build.beginBreak(getTeam(), current.x, current.y); Call.beginBreak(getTeam(), current.x, current.y);
}else{ }else{
getPlaceQueue().removeFirst(); getPlaceQueue().removeFirst();
return; return;
@@ -222,7 +222,6 @@ public interface BuilderTrait extends Entity, TeamTrait{
BuildEntity entity = tile.entity(); BuildEntity entity = tile.entity();
if(entity == null){ if(entity == null){
getPlaceQueue().removeFirst();
return; return;
} }
core/src/io/anuke/mindustry/world/Build.java
+4
View File
@@ -1,5 +1,7 @@
package io.anuke.mindustry.world; package io.anuke.mindustry.world;
import io.anuke.annotations.Annotations.Loc;
import io.anuke.annotations.Annotations.Remote;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.Events; import io.anuke.arc.Events;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
@@ -19,6 +21,7 @@ public class Build{
private static final Rectangle rect = new Rectangle(); private static final Rectangle rect = new Rectangle();
/**Returns block type that was broken, or null if unsuccesful.*/ /**Returns block type that was broken, or null if unsuccesful.*/
@Remote(called = Loc.server)
public static void beginBreak(Team team, int x, int y){ public static void beginBreak(Team team, int x, int y){
if(!validBreak(team, x, y)){ if(!validBreak(team, x, y)){
return; return;
@@ -69,6 +72,7 @@ public class Build{
} }
/**Places a BuildBlock at this location.*/ /**Places a BuildBlock at this location.*/
@Remote(called = Loc.server)
public static void beginPlace(Team team, int x, int y, Block result, int rotation){ public static void beginPlace(Team team, int x, int y, Block result, int rotation){
if(!validPlace(team, x, y, result, rotation)){ if(!validPlace(team, x, y, result, rotation)){
return; return;