Merge remote-tracking branch 'origin/master'

2020-09-05 10:14:53 -04:00
parent 631b0a7761 f447aeff3e
commit bc74208c8c
2 changed files with 8 additions and 6 deletions
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -768,14 +768,14 @@ public class Blocks implements ContentList{
        phaseWall = new Wall("phase-wall"){{
            requirements(Category.defense, with(Items.phasefabric, 6));
            health = 150 * wallHealthMultiplier;
-            flashWhite = deflect = true;
+            flashHit = deflect = true;
        }};

        phaseWallLarge = new Wall("phase-wall-large"){{
            requirements(Category.defense, ItemStack.mult(phaseWall.requirements, 4));
            health = 150 * 4 * wallHealthMultiplier;
            size = 2;
-            flashWhite = deflect = true;
+            flashHit = deflect = true;
        }};

        surgeWall = new Wall("surge-wall"){{