Merge pull request Anuken#3 from Blockzilla101/nydus_patch_1

fixed flying over surge tower crash
Blockzilla101 · Apr 10, 2020 · 736de64 · 736de64
2 parents 3f94755 + 1dc7456
commit 736de64
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java
@@ -558,7 +558,7 @@ public void update(){
             }
         }
 
-        if(isFlying() && tile != null) tile.getAroundTiles(tempTiles).each(t -> t.block.skyscraper, t -> Core.app.post(() -> t.entity.damage(velocity.len2())));
+        if(isFlying() && tile != null) tile.getAroundTiles(tempTiles).each(t -> t.block.skyscraper, t -> Core.app.post(() -> { if (t != null) t.entity.damage(velocity.len2()); }));
 
         boostHeat = Mathf.lerpDelta(boostHeat, (tile != null && tile.solid()) || (isBoosting && ((!movement.isZero() && moved) || !isLocal)) ? 1f : 0f, 0.08f);
         shootHeat = Mathf.lerpDelta(shootHeat, isShooting() ? 1f : 0f, 0.06f);