Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2022-03-09 11:42:18 -05:00
parent 775c7722b2 2759aa2793
commit 9242ae1ecb
9 changed files with 44 additions and 19 deletions
--- a/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
@@ -18,7 +18,7 @@ public class PointDefenseTurret extends ReloadTurret{
    public final int timerTarget = timers++;
    public float retargetTime = 5f;

-    public @Load("block-@size") TextureRegion baseRegion;
+    public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;

    public Color color = Color.white;
    public Effect beamEffect = Fx.pointBeam;