From 8041c305ad3a4a2f046b835b4acc533b33c471b7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 13 Jul 2021 10:28:35 -0400
Subject: [PATCH] Misc bugfixes

---
 core/assets/bundles/bundle.properties              | 1 +
 core/src/mindustry/Vars.java                       | 5 -----
 core/src/mindustry/entities/bullet/BulletType.java | 4 ++--
 core/src/mindustry/entities/comp/BuildingComp.java | 1 -
 core/src/mindustry/entities/comp/PhysicsComp.java  | 1 +
 core/src/mindustry/world/meta/StatValues.java      | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index c38e4b930f..89e7c59f2c 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -101,6 +101,7 @@ customgame = Custom Game
 newgame = New Game
 none = <none>
 none.found = [lightgray]<none found>
+none.inmap = [lightgray]<none in map>
 minimap = Minimap
 position = Position
 close = Close
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index ac5268e59b..a167606c00 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -24,10 +24,8 @@ import mindustry.logic.*;
 import mindustry.maps.Map;
 import mindustry.maps.*;
 import mindustry.mod.*;
-import mindustry.net.Net;
 import mindustry.net.*;
 import mindustry.service.*;
-import mindustry.world.*;
 
 import java.io.*;
 import java.nio.charset.*;
@@ -113,8 +111,6 @@ public class Vars implements Loadable{
     public static final float tilePayload = tilesize * tilesize;
     /** icon sizes for UI */
     public static final float iconXLarge = 8*6f, iconLarge = 8*5f, iconMed = 8*4f, iconSmall = 8*3f;
-    /** tile used in certain situations, instead of null */
-    public static Tile emptyTile;
     /** for map generator dialog */
     public static boolean updateEditorOnChange = false;
     /** all choosable player colors in join/host dialog */
@@ -278,7 +274,6 @@ public class Vars implements Loadable{
         schematicDirectory = dataDirectory.child("schematics/");
         bebuildDirectory = dataDirectory.child("be_builds/");
         emptyMap = new Map(new StringMap());
-        emptyTile = null;
 
         if(tree == null) tree = new FileTree();
         if(mods == null) mods = new Mods();
diff --git a/core/src/mindustry/entities/bullet/BulletType.java b/core/src/mindustry/entities/bullet/BulletType.java
index ebe84d0f24..4a1df75e62 100644
--- a/core/src/mindustry/entities/bullet/BulletType.java
+++ b/core/src/mindustry/entities/bullet/BulletType.java
@@ -232,8 +232,8 @@ public class BulletType extends Content implements Cloneable{
         }
 
         if(entity instanceof Unit unit){
-            Tmp.v3.set(unit).sub(b.x, b.y).nor().scl(knockback * 80f);
-            if(impact) Tmp.v3.setAngle(b.rotation());
+            Tmp.v3.set(unit).sub(b).nor().scl(knockback * 80f);
+            if(impact) Tmp.v3.setAngle(b.rotation() + (knockback < 0 ? 180f : 0f));
             unit.impulse(Tmp.v3);
             unit.apply(status, statusDuration);
         }
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 83c20b40ab..24d4e5cb3e 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -106,7 +106,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Sets up all the necessary variables, but does not add this entity anywhere. */
     public Building create(Block block, Team team){
-        this.tile = emptyTile;
         this.block = block;
         this.team = team;
 
diff --git a/core/src/mindustry/entities/comp/PhysicsComp.java b/core/src/mindustry/entities/comp/PhysicsComp.java
index 1924de8eb9..a3009fe2a8 100644
--- a/core/src/mindustry/entities/comp/PhysicsComp.java
+++ b/core/src/mindustry/entities/comp/PhysicsComp.java
@@ -2,6 +2,7 @@ package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.math.geom.*;
+import arc.util.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.async.PhysicsProcess.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java
index 4a7704e36f..fc2ff2609d 100644
--- a/core/src/mindustry/world/meta/StatValues.java
+++ b/core/src/mindustry/world/meta/StatValues.java
@@ -143,7 +143,7 @@ public class StatValues{
                             }
                         }
                     }else{
-                        c.add("@none.found");
+                        c.add("@none.inmap");
                     }
                 }else{
                     c.add("@stat.showinmap");