From f683496440d735536db40878f142a5782dfc64c2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 15 Oct 2021 14:24:40 -0400 Subject: [PATCH] cleanup --- core/src/mindustry/content/Blocks.java | 5 +---- core/src/mindustry/entities/comp/PlayerComp.java | 2 +- core/src/mindustry/world/blocks/environment/EmptyFloor.java | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b9204490a9..74bd9d6e40 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -237,10 +237,7 @@ public class Blocks implements ContentList{ canShadow = false; }}; - empty = new EmptyFloor("empty"){{ - placeableOn = false; - solid = true; - }}; + empty = new EmptyFloor("empty"); stone = new Floor("stone"); diff --git a/core/src/mindustry/entities/comp/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java index 791157ad56..38a43cae87 100644 --- a/core/src/mindustry/entities/comp/PlayerComp.java +++ b/core/src/mindustry/entities/comp/PlayerComp.java @@ -38,11 +38,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra boolean admin; String name = "frog"; Color color = new Color(); - //locale should not be synced. transient String locale = "en"; transient float deathTimer; transient String lastText = ""; transient float textFadeTime; + transient private Unit lastReadUnit = Nulls.unit; transient private int wrongReadUnits; transient @Nullable Unit justSwitchFrom, justSwitchTo; diff --git a/core/src/mindustry/world/blocks/environment/EmptyFloor.java b/core/src/mindustry/world/blocks/environment/EmptyFloor.java index 3b1aba9e82..436150792d 100644 --- a/core/src/mindustry/world/blocks/environment/EmptyFloor.java +++ b/core/src/mindustry/world/blocks/environment/EmptyFloor.java @@ -3,12 +3,15 @@ package mindustry.world.blocks.environment; import mindustry.content.*; import mindustry.world.*; +/** Empty floor is *not* equivalent to air. Unlike air, it is solid, and still draws neighboring tile edges. */ public class EmptyFloor extends Floor{ public EmptyFloor(String name){ super(name); variants = 0; canShadow = false; + placeableOn = false; + solid = true; } @Override