diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java index 844447e7b8..423026f5f4 100644 --- a/core/src/mindustry/core/NetServer.java +++ b/core/src/mindustry/core/NetServer.java @@ -234,6 +234,13 @@ public class NetServer implements ApplicationListener{ RemoteReadServer.readPacket(packet.writeBuffer, packet.type, con.player); }catch(ValidateException e){ Log.debug("Validation failed for '{0}': {1}", e.player, e.getMessage()); + }catch(RuntimeException e){ + if(e.getCause() instanceof ValidateException){ + ValidateException v = (ValidateException)e.getCause(); + Log.debug("Validation failed for '{0}': {1}", v.player, v.getMessage()); + }else{ + throw e; + } } }); diff --git a/core/src/mindustry/entities/traits/BuilderTrait.java b/core/src/mindustry/entities/traits/BuilderTrait.java index 570f5eabf9..a05fc685ec 100644 --- a/core/src/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/mindustry/entities/traits/BuilderTrait.java @@ -67,9 +67,9 @@ public interface BuilderTrait extends Entity, TeamTrait{ if(!(tile.block() instanceof BuildBlock)){ if(!current.initialized && 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(!current.initialized && 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{ buildQueue().removeFirst(); return;