From 0b141b6eb00d43449ca1fb8fff7caa0a4831581f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 9 May 2022 12:51:05 -0400
Subject: [PATCH] more misc bugfixes

---
 core/src/mindustry/entities/comp/PayloadComp.java | 2 +-
 core/src/mindustry/graphics/MinimapRenderer.java  | 4 ++++
 core/src/mindustry/type/unit/MissileUnitType.java | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index 0bb9d11fd5..a1121f4454 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -72,7 +72,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     }
 
     boolean canPickupPayload(Payload pay){
-        return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f;
+        return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity + 0.001f && (type.pickupUnits || !(pay instanceof UnitPayload));
     }
 
     boolean hasPayload(){
diff --git a/core/src/mindustry/graphics/MinimapRenderer.java b/core/src/mindustry/graphics/MinimapRenderer.java
index a8e0cf26ab..93871e917b 100644
--- a/core/src/mindustry/graphics/MinimapRenderer.java
+++ b/core/src/mindustry/graphics/MinimapRenderer.java
@@ -162,6 +162,10 @@ public class MinimapRenderer{
             //crisp pixels
             dynamicTex.setFilter(TextureFilter.nearest);
 
+            if(worldSpace){
+                region.set(0f, 0f, 1f, 1f);
+            }
+
             Tmp.tr1.set(dynamicTex);
             Tmp.tr1.set(region.u, 1f - region.v, region.u2, 1f - region.v2);
 
diff --git a/core/src/mindustry/type/unit/MissileUnitType.java b/core/src/mindustry/type/unit/MissileUnitType.java
index 4e44eb92d9..8c83cb7a65 100644
--- a/core/src/mindustry/type/unit/MissileUnitType.java
+++ b/core/src/mindustry/type/unit/MissileUnitType.java
@@ -19,7 +19,7 @@ public class MissileUnitType extends UnitType{
         isEnemy = false;
         useUnitCap = false;
         allowedInPayloads = false;
-        aiController = MissileAI::new;
+        controller = u -> new MissileAI();
         flying = true;
         constructor = TimedKillUnit::create;
         envEnabled = Env.any;