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
2022-10-04 12:06:05 -04:00
parent be5eac5335 743495a6d7
commit e661abaf24
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/type/ammo/ItemAmmoType.java
View File

@@ -46,7 +46,7 @@ public class ItemAmmoType implements AmmoType{
float range = unit.hitSize + this.range; 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){ if(build != null){
Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit); Fx.itemTransfer.at(build.x, build.y, ammoPerItem / 2f, item.color, unit);

2
servers_v7.json
View File

@@ -13,7 +13,7 @@
}, },
{ {
"name": "Voiddustry", "name": "Voiddustry",
"address": ["45.144.66.250:6566"] "address": ["45.144.66.250:6566", "45.144.66.250:6565"]
}, },
{ {
"name": "C.A.M.S.", "name": "C.A.M.S.",