Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-06-22 14:22:58 -04:00
parent 45dc72faf6 42c643f769
commit 4417a83424
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -136,6 +136,7 @@ public class ItemTurret extends Turret{
} }
BulletType type = ammoTypes.get(item); BulletType type = ammoTypes.get(item);
if(type == null) return;
totalAmmo += type.ammoMultiplier; totalAmmo += type.ammoMultiplier;
//find ammo entry by type //find ammo entry by type

5
servers_be.json
View File

@@ -12,6 +12,9 @@
"address": "mindustry.pl:7777" "address": "mindustry.pl:7777"
}, },
{ {
"address": "mindurka.tk:9999" "address": "v7.mindurka.tk:9999"
},
{
"address": "mindustry.me:7000"
} }
] ]

4
servers_v6.json
View File

@@ -106,5 +106,9 @@
{ {
"name": "MeowLand", "name": "MeowLand",
"address": ["34.134.111.15"] "address": ["34.134.111.15"]
},
{
"name": "[accent]Mindustry [red]Reborn",
"address": ["mindustry.me", "mindustry.me:1000", "mindustry.me:2000", "mindustry.me:3000"]
} }
] ]