Merge remote-tracking branch 'origin/master'

2019-12-05 22:06:57 -05:00
parent 6f146c6cad db5bd7eea8
commit ef24e5ecad
4 changed files with 12 additions and 1 deletions
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/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);
            }