From 09f718ba3d7044463b5d5587817a5bbe912f9016 Mon Sep 17 00:00:00 2001
From: TranquillyUnpleasant
 <62061444+TranquillyUnpleasant@users.noreply.github.com>
Date: Thu, 28 Oct 2021 06:38:32 +0500
Subject: [PATCH 1/5] fix rare crash when someone spawns a lot of units (#6243)

---
 core/src/mindustry/async/PhysicsProcess.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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();

From 10f2a7b59c3c934e5415a1f34084c30848bad919 Mon Sep 17 00:00:00 2001
From: hortiSquash <45213805+hortiSquash@users.noreply.github.com>
Date: Thu, 28 Oct 2021 16:01:05 +0200
Subject: [PATCH 2/5] hortiloader hotfix (#6248)

Added an offset so they cycle through all buildings having the same load
---
 core/src/mindustry/world/blocks/storage/Unloader.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

From cd5fb71b3415d00686d1e8d21680bb43e555e942 Mon Sep 17 00:00:00 2001
From: Fernando <fernandopach2017@gmail.com>
Date: Thu, 28 Oct 2021 15:59:17 -0300
Subject: [PATCH 3/5] Update servers_v7.json (#6252)

Update server IP
---
 servers_v7.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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",

From 95b6ac36fc82e5c0bc87f7838e77d3bc84ce9c25 Mon Sep 17 00:00:00 2001
From: Zelaux <58040045+Zelaux@users.noreply.github.com>
Date: Fri, 29 Oct 2021 02:19:00 +0500
Subject: [PATCH 4/5] Fixed wrong weapon outline height and code duplication
 (#6250)

* Fixed wrong weapon outline height and code duplication

* Correct formatting
---
 core/src/mindustry/type/Weapon.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

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,

From 330ed9d390ab9b85160e7f6539397c94f55c5edf Mon Sep 17 00:00:00 2001
From: Rex <77251557+Rex-Hm@users.noreply.github.com>
Date: Thu, 28 Oct 2021 22:08:46 -0300
Subject: [PATCH 5/5] Update servers_v6.json (#6255)

---
 servers_v6.json | 4 ++++
 1 file changed, 4 insertions(+)

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"]