cleanup
This commit is contained in:
@@ -237,10 +237,7 @@ public class Blocks implements ContentList{
|
|||||||
canShadow = false;
|
canShadow = false;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
empty = new EmptyFloor("empty"){{
|
empty = new EmptyFloor("empty");
|
||||||
placeableOn = false;
|
|
||||||
solid = true;
|
|
||||||
}};
|
|
||||||
|
|
||||||
stone = new Floor("stone");
|
stone = new Floor("stone");
|
||||||
|
|
||||||
|
|||||||
@@ -38,11 +38,11 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
|
|||||||
boolean admin;
|
boolean admin;
|
||||||
String name = "frog";
|
String name = "frog";
|
||||||
Color color = new Color();
|
Color color = new Color();
|
||||||
//locale should not be synced.
|
|
||||||
transient String locale = "en";
|
transient String locale = "en";
|
||||||
transient float deathTimer;
|
transient float deathTimer;
|
||||||
transient String lastText = "";
|
transient String lastText = "";
|
||||||
transient float textFadeTime;
|
transient float textFadeTime;
|
||||||
|
|
||||||
transient private Unit lastReadUnit = Nulls.unit;
|
transient private Unit lastReadUnit = Nulls.unit;
|
||||||
transient private int wrongReadUnits;
|
transient private int wrongReadUnits;
|
||||||
transient @Nullable Unit justSwitchFrom, justSwitchTo;
|
transient @Nullable Unit justSwitchFrom, justSwitchTo;
|
||||||
|
|||||||
@@ -3,12 +3,15 @@ package mindustry.world.blocks.environment;
|
|||||||
import mindustry.content.*;
|
import mindustry.content.*;
|
||||||
import mindustry.world.*;
|
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 class EmptyFloor extends Floor{
|
||||||
|
|
||||||
public EmptyFloor(String name){
|
public EmptyFloor(String name){
|
||||||
super(name);
|
super(name);
|
||||||
variants = 0;
|
variants = 0;
|
||||||
canShadow = false;
|
canShadow = false;
|
||||||
|
placeableOn = false;
|
||||||
|
solid = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user