From 37999e0870d61c229babec23b897a750cfc7389d Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 2 Apr 2019 14:26:23 -0400 Subject: [PATCH] Risky building changes --- .../src/io/anuke/mindustry/entities/traits/BuilderTrait.java | 5 ++--- core/src/io/anuke/mindustry/world/Build.java | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index e4c436d084..8122d5f3b4 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -202,9 +202,9 @@ public interface BuilderTrait extends Entity, TeamTrait{ if(!(tile.block() instanceof BuildBlock)){ 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)){ - Build.beginBreak(getTeam(), current.x, current.y); + Call.beginBreak(getTeam(), current.x, current.y); }else{ getPlaceQueue().removeFirst(); return; @@ -222,7 +222,6 @@ public interface BuilderTrait extends Entity, TeamTrait{ BuildEntity entity = tile.entity(); if(entity == null){ - getPlaceQueue().removeFirst(); return; } diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index a9bcb31bfd..322c736c15 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -1,5 +1,7 @@ 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.Events; import io.anuke.arc.math.Mathf; @@ -19,6 +21,7 @@ public class Build{ private static final Rectangle rect = new Rectangle(); /**Returns block type that was broken, or null if unsuccesful.*/ + @Remote(called = Loc.server) public static void beginBreak(Team team, int x, int y){ if(!validBreak(team, x, y)){ return; @@ -69,6 +72,7 @@ public class Build{ } /**Places a BuildBlock at this location.*/ + @Remote(called = Loc.server) public static void beginPlace(Team team, int x, int y, Block result, int rotation){ if(!validPlace(team, x, y, result, rotation)){ return;