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

Actually sync ItemTurret's ammo (#5154)

Browse Source
This commit is contained in:
Leonid Skorospelov
2021-04-25 16:06:45 +03:00
committed by GitHub
parent 8cd7e1c307
commit 6eea8bebdf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,14 +165,16 @@ public class ItemTurret extends Turret{
@Override @Override
public void read(Reads read, byte revision){ public void read(Reads read, byte revision){
super.read(read, revision); super.read(read, revision);
ammo.clear();
totalAmmo = 0;
int amount = read.ub(); int amount = read.ub();
for(int i = 0; i < amount; i++){ for(int i = 0; i < amount; i++){
Item item = Vars.content.item(revision < 2 ? read.ub() : read.s()); Item item = Vars.content.item(revision < 2 ? read.ub() : read.s());
short a = read.s(); short a = read.s();
totalAmmo += a;
//only add ammo if this is a valid ammo type //only add ammo if this is a valid ammo type
if(item != null && ammoTypes.containsKey(item)){ if(item != null && ammoTypes.containsKey(item)){
totalAmmo += a;
ammo.add(new ItemEntry(item, a)); ammo.add(new ItemEntry(item, a));
} }
} }