Merge branches 'better-diagonals' and 'master' of https://github.com/Anuken/Mindustry

2019-11-02 14:09:32 -04:00
parent 2209968963 06cfe9a9cc
commit 19796092e5
3 changed files with 4 additions and 3 deletions
--- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -14,7 +14,7 @@ import io.anuke.mindustry.world.meta.values.*;

 import static io.anuke.mindustry.Vars.*;

-public abstract class LiquidTurret extends Turret{
+public class LiquidTurret extends Turret{
    protected ObjectMap<Liquid, BulletType> ammo = new ObjectMap<>();

    public LiquidTurret(String name){