Beter payload updating system

core/src/mindustry/entities/comp/BuildingComp.java

@@ -1732,6 +1732,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         }
     }
 
+    public void updatePayload(@Nullable Unit unitHolder, @Nullable Building buildingHolder){
+        update();
+    }
+
     public void updateTile(){
 
     }

core/src/mindustry/entities/comp/PayloadComp.java

@@ -56,7 +56,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
             //    build.build.team = team;
             //}
             pay.set(x, y, rotation);
-            pay.update(true);
+            pay.update(self(), null);
         }
     }
 

core/src/mindustry/type/UnitType.java

@@ -466,6 +466,10 @@ public class UnitType extends UnlockableContent{
 
     }
 
+    public void updatePayload(Unit unit, @Nullable Unit unitHolder, @Nullable Building buildingHolder){
+
+    }
+
     public void landed(Unit unit){}
 
     public void display(Unit unit, Table table){

core/src/mindustry/world/blocks/payloads/BuildPayload.java

@@ -2,6 +2,7 @@ package mindustry.world.blocks.payloads;
 
 import arc.graphics.g2d.*;
 import arc.math.*;
+import arc.util.*;
 import arc.util.io.*;
 import mindustry.ctype.*;
 import mindustry.game.*;
@@ -43,11 +44,11 @@ public class BuildPayload implements Payload{
     }
 
     @Override
-    public void update(boolean inUnit){
-        if(inUnit && (!build.block.updateInUnits || (!state.rules.unitPayloadUpdate && !build.block.alwaysUpdateInUnits))) return;
+    public void update(@Nullable Unit unitHolder, @Nullable Building buildingHolder){
+        if(unitHolder != null && (!build.block.updateInUnits || (!state.rules.unitPayloadUpdate && !build.block.alwaysUpdateInUnits))) return;
 
         build.tile = emptyTile;
-        build.update();
+        build.updatePayload(unitHolder, buildingHolder);
     }
 
     @Override

core/src/mindustry/world/blocks/payloads/Payload.java

@@ -36,9 +36,8 @@ public interface Payload extends Position{
     /** @return the time taken to build this payload. */
     float buildTime();
 
-    /** update this payload if it is a block
-     * @param inUnit whether this payload is in a unit */
-    default void update(boolean inUnit){}
+    /** update this payload inside a container unit or building. either can be null. */
+    default void update(@Nullable Unit unitHolder, @Nullable Building buildingHolder){}
 
     /** @return whether this payload was dumped. */
     default boolean dump(){

core/src/mindustry/world/blocks/payloads/PayloadBlock.java

@@ -146,7 +146,7 @@ public class PayloadBlock extends Block{
         @Override
         public void updateTile(){
             if(payload != null){
-                payload.update(false);
+                payload.update(null, this);
             }
         }
 

core/src/mindustry/world/blocks/payloads/PayloadConveyor.java

@@ -128,7 +128,7 @@ public class PayloadConveyor extends Block{
             if(!enabled) return;
 
             if(item != null){
-                item.update(false);
+                item.update(null, this);
             }
 
             lastInterp = curInterp;

core/src/mindustry/world/blocks/payloads/PayloadUnloader.java

@@ -48,7 +48,7 @@ public class PayloadUnloader extends PayloadLoader{
         @Override
         public void updateTile(){
             if(payload != null){
-                payload.update(false);
+                payload.update(null, this);
             }
             lastOutputPower = 0f;
 

core/src/mindustry/world/blocks/payloads/UnitPayload.java

@@ -41,6 +41,11 @@ public class UnitPayload implements Payload{
         showOverlay(icon.getRegion());
     }
 
+    @Override
+    public void update(@Nullable Unit unitHolder, @Nullable Building buildingHolder){
+        unit.type.updatePayload(unit, unitHolder, buildingHolder);
+    }
+
     @Override
     public UnlockableContent content(){
         return unit.type;