Bugfixes

core/src/mindustry/content/UnitTypes.java

@@ -45,10 +45,7 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma;
 
     //water
-    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke;
+    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde;
-
-    //water + payload
-    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class, Payloadc.class}) UnitType bryde;
 
     //special block unit type
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
@@ -776,7 +773,6 @@ public class UnitTypes implements ContentList{
             trailX = 7f;
             trailY = -9f;
             trailScl = 1.5f;
-            payloadCapacity = 4;
 
             abilities.add(new HealFieldAbility(22f, 60f * 4, 70f), new ShieldFieldAbility(20f, 40f, 60f * 4, 60f));
 

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

@@ -539,6 +539,10 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
         return base();
     }
 
+    public @Nullable Payload getPayload(){
+        return null;
+    }
+
     /** Tries to take the payload. Returns null if no payload is present. */
     public @Nullable Payload takePayload(){
         return null;

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

@@ -12,7 +12,7 @@ import mindustry.world.blocks.payloads.*;
 
 /** An entity that holds a payload. */
 @Component
-abstract class PayloadComp implements Posc, Rotc{
+abstract class PayloadComp implements Posc, Rotc, Hitboxc{
     @Import float x, y, rotation;
 
     Seq<Payload> payloads = new Seq<>();

core/src/mindustry/input/InputHandler.java

@@ -129,10 +129,13 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
             if(tile.block().buildVisibility != BuildVisibility.hidden && tile.block().size <= 2){
                 pay.pickup(tile);
             }else{ //pick up block payload
-                Payload taken = tile.takePayload();
+                Payload current = tile.getPayload();
-                if(taken != null){
+                if(current != null && current.canBeTaken(pay)){
-                    pay.addPayload(taken);
+                    Payload taken = tile.takePayload();
-                    Fx.unitPickup.at(tile);
+                    if(taken != null){
+                        pay.addPayload(taken);
+                        Fx.unitPickup.at(tile);
+                    }
                 }
             }
         }

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

@@ -88,6 +88,11 @@ public class PayloadConveyor extends Block{
             blocked = (next != null && next.solid()) || (this.next != null && (this.next.rotation() + 2)%4 == rotation());
         }
 
+        @Override
+        public Payload getPayload(){
+            return item;
+        }
+
         @Override
         public void updateTile(){
             progress = Time.time() % moveTime;

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

@@ -33,6 +33,11 @@ public class BlockPayload implements Payload{
         tile.setBlock(entity.block(), entity.team(), rotation, () -> entity);
     }
 
+    @Override
+    public boolean canBeTaken(Payloadc picker){
+        return entity.block.size <= 2;
+    }
+
     @Override
     public boolean fits(){
         return entity.block().size < 3;

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

@@ -27,6 +27,11 @@ public interface Payload{
         return true;
     }
 
+    /** @return whether the unit can pick up this payload. */
+    default boolean canBeTaken(Payloadc picker){
+        return true;
+    }
+
     /** writes the payload for saving. */
     void write(Writes write);
 

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

@@ -20,6 +20,11 @@ public class UnitPayload implements Payload{
         return unit.hitSize <= 16f;
     }
 
+    @Override
+    public boolean canBeTaken(Payloadc picker){
+        return unit.hitSize < picker.hitSize();
+    }
+
     @Override
     public void write(Writes write){
         write.b(payloadUnit);

core/src/mindustry/world/blocks/production/PayloadAcceptor.java

@@ -65,6 +65,11 @@ public class PayloadAcceptor extends Block{
             updatePayload();
         }
 
+        @Override
+        public Payload getPayload(){
+            return payload;
+        }
+
         @Override
         public Payload takePayload(){
             T t = payload;

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=bb0d60276c0471b920a636d3d32ea838e73be8c2
+archash=a49c1c1da93e43d0afe43e565fc3a0800a5137a5