New tests / Bugfixes

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

@@ -175,14 +175,17 @@ public class Fire extends TimedEntity implements SaveTrait, SyncTrait, Poolable{
 
     @Override
     public void write(DataOutput data) throws IOException{
-        data.writeFloat(x);
-        data.writeFloat(y);
+        data.writeInt(tile.pos());
+        data.writeFloat(lifetime);
     }
 
     @Override
     public void read(DataInput data) throws IOException{
-        x = data.readFloat();
-        y = data.readFloat();
+        int pos = data.readInt();
+        this.lifetime = data.readFloat();
+
+        x = Pos.x(pos) * tilesize;
+        y = Pos.y(pos) * tilesize;
     }
 
     @Override

core/src/io/anuke/mindustry/entities/type/BaseUnit.java

@@ -17,9 +17,7 @@ import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.traits.ShooterTrait;
 import io.anuke.mindustry.entities.traits.TargetTrait;
-import io.anuke.mindustry.entities.units.StateMachine;
-import io.anuke.mindustry.entities.units.UnitDrops;
-import io.anuke.mindustry.entities.units.UnitState;
+import io.anuke.mindustry.entities.units.*;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.net.Net;
@@ -27,9 +25,7 @@ import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.IOException;
+import java.io.*;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -181,6 +177,11 @@ public abstract class BaseUnit extends Unit implements ShooterTrait{
         return hasEffect(StatusEffects.boss);
     }
 
+    @Override
+    public float getDamageMultipler(){
+        return status.getDamageMultiplier() * Vars.state.rules.unitDamageMultiplier;
+    }
+
     @Override
     public boolean isImmune(StatusEffect effect){
         return type.immunities.contains(effect);