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 diff --git a/servers_be.json b/servers_be.json index d22999dea0..af54f18105 100644 --- a/servers_be.json +++ b/servers_be.json @@ -12,6 +12,9 @@ "address": "mindustry.pl:7777" }, { - "address": "mindurka.tk:9999" + "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"] } ]