Bugfixes

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

@@ -51,7 +51,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     }
 
     void pickup(Building tile){
-        tile.tile().remove();
+        tile.tile.remove();
         payloads.add(new BlockPayload(tile));
         Fx.unitPickup.at(tile);
     }

core/src/mindustry/input/DesktopInput.java

@@ -354,8 +354,7 @@ public class DesktopInput extends InputHandler{
 
         table.button(Icon.up, Styles.clearPartiali, () -> {
             ui.planet.show(state.getSector(), player.team().core());
-        }).visible(() -> state.isCampaign())
+        }).visible(() -> state.isCampaign()).tooltip("@launchcore");
-        .disabled(b -> player.team().core() == null || !player.team().core().items.has(player.team().core().block.requirements)).tooltip("@launchcore");
     }
 
     void pollInput(){

core/src/mindustry/input/InputHandler.java

@@ -105,57 +105,107 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         player.builder().removeBuild(x, y, breaking);
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
+    @Remote(targets = Loc.both, called = Loc.server)
-    public static void pickupUnitPayload(Player player, Unit target){
+    public static void requestUnitPayload(Player player, Unit target){
         if(player == null) return;
 
         Unit unit = player.unit();
         Payloadc pay = (Payloadc)unit;
 
         if(target.isAI() && target.isGrounded() && pay.canPickup(target)
-            && target.within(unit, unit.type().hitsize * 1.5f + target.type().hitsize)){
+        && target.within(unit, unit.type().hitsize * 2f + target.type().hitsize * 2f)){
-            pay.pickup(target);
+            Call.pickedUnitPayload(player, target);
         }
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
+    @Remote(targets = Loc.both, called = Loc.server)
-    public static void pickupBlockPayload(Player player, Building tile){
+    public static void requestBlockPayload(Player player, Building tile){
         if(player == null) return;
 
         Unit unit = player.unit();
         Payloadc pay = (Payloadc)unit;
 
         if(tile != null && tile.team == unit.team
-            && unit.within(tile, tilesize * tile.block.size * 1.2f)){
+        && unit.within(tile, tilesize * tile.block.size * 1.2f + tilesize * 5f)){
             //pick up block directly
             if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
-                pay.pickup(tile);
+                Call.pickedBlockPayload(player, tile, true);
             }else{ //pick up block payload
                 Payload current = tile.getPayload();
                 if(current != null && pay.canPickupPayload(current)){
-                    Payload taken = tile.takePayload();
+                    Call.pickedBlockPayload(player, tile, false);
-                    if(taken != null){
-                        pay.addPayload(taken);
-                        Fx.unitPickup.at(tile);
-                    }
                 }
             }
         }
     }
 
-    @Remote(targets = Loc.both, called = Loc.server, forward = true)
+    @Remote(targets = Loc.server, called = Loc.server)
-    public static void dropPayload(Player player, float x, float y){
+    public static void pickedUnitPayload(Player player, Unit target){
+        if(player == null || target == null || !(player.unit() instanceof Payloadc)){
+            if(target != null){
+                target.remove();
+            }
+            return;
+        }
+
+        ((Payloadc)player.unit()).pickup(target);
+    }
+
+    @Remote(targets = Loc.server, called = Loc.server)
+    public static void pickedBlockPayload(Player player, Building tile, boolean onGround){
+        if(player == null || tile == null || !(player.unit() instanceof Payloadc)){
+            if(tile != null && onGround){
+                Fx.unitPickup.at(tile);
+                tile.tile.remove();
+            }
+            return;
+        }
+
+        Unit unit = player.unit();
+        Payloadc pay = (Payloadc)unit;
+
+        if(onGround){
+            if(tile.block.buildVisibility != BuildVisibility.hidden && tile.canPickup() && pay.canPickup(tile)){
+                pay.pickup(tile);
+            }else{
+                Fx.unitPickup.at(tile);
+                tile.tile.remove();
+            }
+        }else{
+            Payload current = tile.getPayload();
+            if(current != null && pay.canPickupPayload(current)){
+                Payload taken = tile.takePayload();
+                if(taken != null){
+                    pay.addPayload(taken);
+                    Fx.unitPickup.at(tile);
+                }
+            }
+        }
+    }
+
+    @Remote(targets = Loc.both, called = Loc.server)
+    public static void requestDropPayload(Player player, float x, float y){
+        if(player == null || net.client()) return;
+
+        Payloadc pay = (Payloadc)player.unit();
+
+        //apply margin of error
+        Tmp.v1.set(x, y).sub(pay).limit(tilesize * 4f).add(pay);
+        float cx = Tmp.v1.x, cy = Tmp.v1.y;
+
+        Call.payloadDropped(player, cx, cy);
+    }
+
+    @Remote(called = Loc.server, targets = Loc.server)
+    public static void payloadDropped(Player player, float x, float y){
         if(player == null) return;
 
         Payloadc pay = (Payloadc)player.unit();
 
-        //allow a slight margin of error
+        float prevx = pay.x(), prevy = pay.y();
-        if(pay.within(x, y, tilesize * 2f)){
+        pay.set(x, y);
-            float prevx = pay.x(), prevy = pay.y();
+        pay.dropLastPayload();
-            pay.set(x, y);
+        pay.set(prevx, prevy);
-            pay.dropLastPayload();
-            pay.set(prevx, prevy);
-        }
     }
 
     @Remote(targets = Loc.client, called = Loc.server)
@@ -340,12 +390,12 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
 
         Unit target = Units.closest(player.team(), pay.x(), pay.y(), unit.type().hitsize * 2.5f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
         if(target != null){
-            Call.pickupUnitPayload(player, target);
+            Call.requestUnitPayload(player, target);
         }else{
             Building tile = world.buildWorld(pay.x(), pay.y());
 
             if(tile != null && tile.team == unit.team){
-                Call.pickupBlockPayload(player, tile);
+                Call.requestBlockPayload(player, tile);
             }
         }
     }
@@ -354,7 +404,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         Unit unit = player.unit();
         if(!(unit instanceof Payloadc)) return;
 
-        Call.dropPayload(player, player.x, player.y);
+        Call.requestDropPayload(player, player.x, player.y);
     }
 
     public float getMouseX(){

core/src/mindustry/logic/LExecutor.java

@@ -3,6 +3,7 @@ package mindustry.logic;
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import arc.util.noise.*;
 import mindustry.*;
 import mindustry.ctype.*;
 import mindustry.entities.*;
@@ -17,6 +18,9 @@ import static mindustry.Vars.*;
 public class LExecutor{
     public static final int maxInstructions = 1000;
 
+    //for noise operations
+    public static final Simplex noise = new Simplex();
+
     //special variables
     public static final int
         varCounter = 0,

core/src/mindustry/logic/LogicOp.java

@@ -24,6 +24,7 @@ public enum LogicOp{
     min("min", Math::min),
     atan2("atan2", (x, y) -> Mathf.atan2((float)x, (float)y) * Mathf.radDeg),
     dst("dst", (x, y) -> Mathf.dst((float)x, (float)y)),
+    noise("noise", LExecutor.noise::rawNoise2D),
 
     not("not", a -> ~(int)(a)),
     abs("abs", a -> Math.abs(a)),

core/src/mindustry/ui/dialogs/PausedDialog.java

@@ -88,7 +88,7 @@ public class PausedDialog extends BaseDialog{
                 cont.buttonRow("@launchcore", Icon.up, () -> {
                     hide();
                     ui.planet.show(state.getSector(), player.team().core());
-                }).disabled(b -> player.team().core() == null || !player.team().core().items.has(player.team().core().block.requirements));
+                });
 
                 cont.row();
 

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

@@ -30,6 +30,7 @@ public class PayloadConveyor extends Block{
         update = true;
         outputsPayload = true;
         noUpdateDisabled = true;
+        sync = true;
     }
 
     @Override
@@ -210,8 +211,6 @@ public class PayloadConveyor extends Block{
             updatePayload();
         }
 
-
-
         @Override
         public void write(Writes write){
             super.write(write);
@@ -225,7 +224,7 @@ public class PayloadConveyor extends Block{
         public void read(Reads read, byte revision){
             super.read(read, revision);
 
-            progress = read.f();
+            read.f(); //why is progress written?
             itemRotation = read.f();
             item = Payload.read(read);
         }