diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index 994a2eaa9a..82c86223c7 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1655,16 +1655,6 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return efficiency * delta(); } - //TODO save/load this, new building version - - //TODO unit tests: - //- 50% power efficiency -> 50% liquid consumption - //- 50% liquid consumption -> other liquid or item consumer runs at 50% efficiency - //- same as above but with overdrive and timeScale = 2 and differing delta values - - //TODO test with overdraw, e.g. requesting 20/frame on a block with only 10 capacity - //- should lead to 50% efficiency, for example - make sure all blocks have, at minimum, 10x their capacity per frame - should last for a second at least - /** Called after efficiency is updated but before consumers are updated. Use to apply your own multiplier. */ public void updateEfficiencyMultiplier(){ diff --git a/core/src/mindustry/game/EventType.java b/core/src/mindustry/game/EventType.java index b30f9d3df8..7a38348c78 100644 --- a/core/src/mindustry/game/EventType.java +++ b/core/src/mindustry/game/EventType.java @@ -74,7 +74,7 @@ public class EventType{ public static class MusicRegisterEvent{} /** Called *after* all the modded files have been added into Vars.tree */ public static class FileTreeInitEvent{} - /** Called when a game begins and the world is loaded. */ + /** Called when a game begins and the world tiles are loaded. Entities are not yet loaded at this stage. */ public static class WorldLoadEvent{} public static class SaveLoadEvent{ diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index 129333e891..fff2947bac 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -36,7 +36,7 @@ import static mindustry.Vars.*; public class ServerControl implements ApplicationListener{ private static final int roundExtraTime = 12; - private static final int maxLogLength = 1024 * 512; + private static final int maxLogLength = 1024 * 1024 * 5; protected static String[] tags = {"&lc&fb[D]&fr", "&lb&fb[I]&fr", "&ly&fb[W]&fr", "&lr&fb[E]", ""}; protected static DateTimeFormatter dateTime = DateTimeFormatter.ofPattern("MM-dd-yyyy HH:mm:ss"),