Implemented new spawnlist

core/src/io/anuke/mindustry/entities/effect/Puddle.java

@@ -179,6 +179,8 @@ public class Puddle extends BaseEntity implements SaveTrait, Poolable, DrawTrait
         //effects-only code
         if(amount >= maxLiquid/2f && updateTime <= 0f){
             Units.getNearby(rect.setSize(Mathf.clamp(amount/(maxLiquid/1.5f))*10f).setCenter(x, y), unit -> {
+                if(unit.isFlying()) return;
+
                 unit.getHitbox(rect2);
                 if(!rect.overlaps(rect2)) return;
 

core/src/io/anuke/mindustry/entities/units/GroundUnit.java

@@ -155,7 +155,7 @@ public abstract class GroundUnit extends BaseUnit {
 
     @Override
     public void readSave(DataInput stream) throws IOException{
-        weapon = Upgrade.getByID(weapon.id);
+        weapon = Upgrade.getByID(stream.readByte());
         super.readSave(stream);
     }
 
@@ -229,7 +229,7 @@ public abstract class GroundUnit extends BaseUnit {
                 state.set(resupply);
             }else if(target != null){
                 if(core != null){
-                    if(dst > inventory.getAmmo().getRange() * 0.7f){
+                    if(dst > inventory.getAmmo().getRange() * 0.5f){
                         moveToCore();
                     }