Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle.properties

@@ -729,7 +729,7 @@ mode.editor.name = Editor
 mode.pvp.name = PvP
 mode.pvp.description = Fight against other players locally.\n[gray]Requires at least 2 differently-colored cores in the map to play.
 mode.attack.name = Attack
-mode.attack.description = Destroy the enemy's base. No waves.\n[gray]Requires a red core in the map to play.
+mode.attack.description = Destroy the enemy's base. \n[gray]Requires a red core in the map to play.
 mode.custom = Custom Rules
 
 rules.infiniteresources = Infinite Resources

core/src/io/anuke/mindustry/world/blocks/BuildBlock.java

@@ -280,6 +280,10 @@ public class BuildBlock extends Block{
 
             progress = Mathf.clamp(progress - amount);
 
+            if(builder instanceof Player){
+                builderID = builder.getID();
+            }
+
             if(progress <= 0 || state.rules.infiniteResources){
                 Call.onDeconstructFinish(tile, this.cblock == null ? previous : this.cblock, builderID);
             }