From 7e7d6120ad3841ee50385a90d33f6b6d0d168a09 Mon Sep 17 00:00:00 2001
From: Darkness6030 <79508138+Darkness6030@users.noreply.github.com>
Date: Mon, 21 Jun 2021 21:16:44 +0300
Subject: [PATCH 1/3] Update mindurka ip (again) (#5443)

Sry, anuke
---
 servers_be.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servers_be.json b/servers_be.json
index d22999dea0..b23329dee7 100644
--- a/servers_be.json
+++ b/servers_be.json
@@ -12,6 +12,6 @@
     "address": "mindustry.pl:7777"
   },
   {
-    "address": "mindurka.tk:9999"
+    "address": "v7.mindurka.tk:9999"
   }
 ]

From b7d5f9a7ab56e7f306f448e8e3999d6b4c066fbb Mon Sep 17 00:00:00 2001
From: Volas171 <admin@o7fire.tk>
Date: Tue, 22 Jun 2021 09:33:38 -0500
Subject: [PATCH 2/3] Add Mindustry Reborn to v7 and v6 ServerList (#5444)

* reborn v6

* v7 reborn lol

* yikes
---
 servers_be.json | 3 +++
 servers_v6.json | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/servers_be.json b/servers_be.json
index b23329dee7..af54f18105 100644
--- a/servers_be.json
+++ b/servers_be.json
@@ -13,5 +13,8 @@
   },
   {
     "address": "v7.mindurka.tk:9999"
+  },
+  {
+    "address": "mindustry.me:7000"
   }
 ]
diff --git a/servers_v6.json b/servers_v6.json
index dfcd37de1b..85cfaf6c5d 100644
--- a/servers_v6.json
+++ b/servers_v6.json
@@ -106,5 +106,9 @@
   {
     "name": "MeowLand",
     "address": ["34.134.111.15"]
+  },
+  {
+    "name": "[accent]Mindustry [red]Reborn",
+    "address": ["mindustry.me", "mindustry.me:1000", "mindustry.me:2000", "mindustry.me:3000"]
   }
 ]

From 42c643f76924e61dd91a74897e5f20d52956d97a Mon Sep 17 00:00:00 2001
From: Patrick 'Quezler' Mounier <Quezler@me.com>
Date: Tue, 22 Jun 2021 19:35:28 +0200
Subject: [PATCH 3/3] Fix ammo multiplier exception in itemturret (#5446)

---
 core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
index 58d0aed084..8e1a2c0ad5 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
@@ -136,6 +136,7 @@ public class ItemTurret extends Turret{
             }
 
             BulletType type = ammoTypes.get(item);
+            if(type == null) return;
             totalAmmo += type.ammoMultiplier;
 
             //find ammo entry by type