From 73dae0da4709b45ce5dcee4608b5621517f2cc3b Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Oct 2021 18:46:11 -0400 Subject: [PATCH] compile fix --- core/src/mindustry/maps/planet/AsteroidGenerator.java | 2 +- .../mindustry/world/blocks/payloads/PayloadBlock.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java index 43dc0c057d..3416db7f22 100644 --- a/core/src/mindustry/maps/planet/AsteroidGenerator.java +++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java @@ -138,7 +138,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ camPos = new Vec3(1.2388899f, 1.6047299f, 2.4758825f); }}; //state.rules.backgroundTexture = "sprites/space.png"; - state.rules.dragMultiplier = 0.5f; + state.rules.dragMultiplier = 0.7f; //yes, yes space has 0 drag but 0% drag is very annoying state.rules.borderDarkness = false; state.rules.environment = Env.space; } diff --git a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java index 012497107e..86247f85aa 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java @@ -81,16 +81,16 @@ public class PayloadBlock extends Block{ } @Override - public boolean canControlSelect(Player player){ - return !player.unit().spawnedByCore && this.payload == null && acceptUnitPayload(player.unit()) && player.tileOn() != null && player.tileOn().build == this; + public boolean canControlSelect(Unit player){ + return !player.spawnedByCore && this.payload == null && acceptUnitPayload(player) && player.tileOn() != null && player.tileOn().build == this; } @Override - public void onControlSelect(Player player){ + public void onControlSelect(Unit player){ float x = player.x, y = player.y; - acceptPlayerPayload(player, p -> payload = (T)p); + handleUnitPayload(player, p -> payload = (T)p); this.payVector.set(x, y).sub(this).clamp(-size * tilesize / 2f, -size * tilesize / 2f, size * tilesize / 2f, size * tilesize / 2f); - this.payRotation = player.unit().rotation; + this.payRotation = player.rotation; } @Override