From 9816bab1516a6061af418a4329e704d2a925f11c Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 30 Aug 2018 09:58:18 -0400 Subject: [PATCH] Fixed build error --- .../anuke/mindustry/maps/generation/FortressGenerator.java | 6 ++++++ core/src/io/anuke/mindustry/net/NetworkIO.java | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index 3f101ab203..260dc5432b 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -41,6 +41,12 @@ public class FortressGenerator{ if(Vector2.dst(x, y, enemyX, enemyY) > coreDst){ continue; } + + Block turret = turrets.first(); + + if(gen.random.chance(0.01) && gen.canPlace(x, y, turret)){ + gen.setBlock(x, y, turret, team); + } } } diff --git a/core/src/io/anuke/mindustry/net/NetworkIO.java b/core/src/io/anuke/mindustry/net/NetworkIO.java index b7de7e5a82..33ebc2dba6 100644 --- a/core/src/io/anuke/mindustry/net/NetworkIO.java +++ b/core/src/io/anuke/mindustry/net/NetworkIO.java @@ -48,8 +48,6 @@ public class NetworkIO{ stream.writeInt(state.wave); //wave stream.writeFloat(state.wavetime); //wave countdown - stream.writeBoolean(state.friendlyFire); //friendly fire state - stream.writeInt(player.id); player.write(stream); @@ -180,7 +178,6 @@ public class NetworkIO{ state.wave = wave; state.wavetime = wavetime; state.mode = GameMode.values()[mode]; - state.friendlyFire = friendlyfire; Entities.clear(); int id = stream.readInt();