From 9ffbba204f766c70b12e7d8e3cba76faeb5664f9 Mon Sep 17 00:00:00 2001
From: Mythril382 <77225817+Mythril382@users.noreply.github.com>
Date: Tue, 4 Oct 2022 19:55:16 +0800
Subject: [PATCH 1/2] unplayable (#7657)

---
 core/src/mindustry/type/ammo/ItemAmmoType.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/type/ammo/ItemAmmoType.java b/core/src/mindustry/type/ammo/ItemAmmoType.java
index dfa7871525..bb7c1ae725 100644
--- a/core/src/mindustry/type/ammo/ItemAmmoType.java
+++ b/core/src/mindustry/type/ammo/ItemAmmoType.java
@@ -46,7 +46,7 @@ public class ItemAmmoType implements AmmoType{
 
         float range = unit.hitSize + this.range;
 
-        Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.canResupply() && u.items.has(item));
+        Building build = Units.closestBuilding(unit.team, unit.x, unit.y, range, u -> u.canResupply() && u.items != null && u.items.has(item));
 
         if(build != null){
             Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit);

From 743495a6d796c436f66bef13e2f019879b5412a1 Mon Sep 17 00:00:00 2001
From: Tomoko <65737359+Taras4k@users.noreply.github.com>
Date: Tue, 4 Oct 2022 17:49:20 +0200
Subject: [PATCH 2/2] Update servers_v7.json (#7659)

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

diff --git a/servers_v7.json b/servers_v7.json
index fdf02cecf2..ffbe2d6362 100644
--- a/servers_v7.json
+++ b/servers_v7.json
@@ -13,7 +13,7 @@
   },
   {
     "name": "Voiddustry",
-    "address": ["45.144.66.250:6566"]
+    "address": ["45.144.66.250:6566", "45.144.66.250:6565"]
   },
   {
     "name": "C.A.M.S.",