diff --git a/core/src/mindustry/async/PhysicsProcess.java b/core/src/mindustry/async/PhysicsProcess.java
index c62281802c..4d7bc59aae 100644
--- a/core/src/mindustry/async/PhysicsProcess.java
+++ b/core/src/mindustry/async/PhysicsProcess.java
@@ -38,7 +38,7 @@ public class PhysicsProcess implements AsyncProcess{
 
         //find Unit without bodies and assign them
         for(Unit entity : group){
-            if(entity.type == null) continue;
+            if(entity == null || entity.type == null) continue;
 
             if(entity.physref == null){
                 PhysicsBody body = new PhysicsBody();
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index 04facbab05..5d7ca4fcc4 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -177,12 +177,8 @@ public class Weapon implements Cloneable{
             Drawf.shadow(wx, wy, shadow);
         }
 
-        if(outlineRegion.found() && top){
-            Draw.rect(outlineRegion,
-            wx, wy,
-            outlineRegion.width * Draw.scl * -Mathf.sign(flipSprite),
-            region.height * Draw.scl,
-            weaponRotation);
+        if(top){
+            drawOutline(unit, mount);
         }
 
         Draw.rect(region,
diff --git a/core/src/mindustry/world/blocks/storage/Unloader.java b/core/src/mindustry/world/blocks/storage/Unloader.java
index 2b8c4ad4a1..abd4b4a99c 100644
--- a/core/src/mindustry/world/blocks/storage/Unloader.java
+++ b/core/src/mindustry/world/blocks/storage/Unloader.java
@@ -85,8 +85,9 @@ public class Unloader extends Block{
             if(sortItem != null){
                 item = sortItem;
 
-                for(int pos = 0; pos < proximity.size; pos++){
-                    var other = proximity.get(pos);
+                for(int j = 0; j < proximity.size; j++){
+                    int pos = (offset + j) % proximity.size;
+                    var other = proximity.get(j);
                     boolean interactable = other.interactable(team);
 
                     //set the stats of all buildings in possibleBlocks
@@ -105,8 +106,9 @@ public class Unloader extends Block{
                     boolean isDistinct = false;
                     Item possibleItem = content.item(total);
 
-                    for(int pos = 0; pos < proximity.size; pos++){
-                        var other = proximity.get(pos);
+                    for(int j = 0; j < proximity.size; j++){
+                        int pos = (offset + j) % proximity.size;
+                        var other = proximity.get(j);
                         boolean interactable = other.interactable(team);
 
                         //set the stats of all buildings in possibleBlocks while we are at it
diff --git a/servers_v6.json b/servers_v6.json
index 22eeb59ed1..2b2ee8646e 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -1,4 +1,8 @@
 [
+  {
+    "name": "Español",
+    "address": ["n2.mindustry.me:4019", "mindustry.me:2034", "mindustry.me:2035"]
+  },
   {
     "name": "RCM",
     "address": ["185.104.248.61", "easyplay.su"]
diff --git a/servers_v7.json b/servers_v7.json
index 9f9d674d95..00a3595282 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -73,7 +73,7 @@
   },
   {
     "name": "MindustryBR",
-    "address": ["n2.mindustry.me:4003", "n2.mindustry.me:4005", "n2.mindustry.me:4008", "n2.mindustry.me:4009", "n2.mindustry.me:4010"]
+    "address": ["n2.mindustry.me:4003", "n2.mindustry.me:4005", "n2.mindustry.me:4008", "panel.mindustry.me:2005", "n2.mindustry.me:4010"]
   },
   {
     "name": "LostDustry",