Fixed #2424
This commit is contained in:
@@ -21,7 +21,8 @@ public class LExecutor{
|
||||
varTime = 1;
|
||||
|
||||
public static final int
|
||||
maxGraphicsBuffer = 512,
|
||||
maxGraphicsBuffer = 256,
|
||||
maxDisplayBuffer = 512,
|
||||
maxTextBuffer = 256;
|
||||
|
||||
public LInstruction[] instructions = {};
|
||||
@@ -462,8 +463,10 @@ public class LExecutor{
|
||||
Building build = exec.building(target);
|
||||
if(build instanceof LogicDisplayBuild){
|
||||
LogicDisplayBuild d = (LogicDisplayBuild)build;
|
||||
for(int i = 0; i < exec.graphicsBuffer.size; i++){
|
||||
d.commands.addLast(exec.graphicsBuffer.items[i]);
|
||||
if(d.commands.size + exec.graphicsBuffer.size < maxDisplayBuffer){
|
||||
for(int i = 0; i < exec.graphicsBuffer.size; i++){
|
||||
d.commands.addLast(exec.graphicsBuffer.items[i]);
|
||||
}
|
||||
}
|
||||
exec.graphicsBuffer.clear();
|
||||
}
|
||||
|
||||
@@ -19,13 +19,14 @@ import static mindustry.Vars.*;
|
||||
import static mindustry.game.EventType.*;
|
||||
|
||||
public class Administration{
|
||||
/** All player info. Maps UUIDs to info. This persists throughout restarts. */
|
||||
public Seq<String> bannedIPs = new Seq<>();
|
||||
public Seq<String> whitelist = new Seq<>();
|
||||
public Seq<ChatFilter> chatFilters = new Seq<>();
|
||||
public Seq<ActionFilter> actionFilters = new Seq<>();
|
||||
public Seq<String> subnetBans = new Seq<>();
|
||||
|
||||
/** All player info. Maps UUIDs to info. This persists throughout restarts. Do not access directly. */
|
||||
private ObjectMap<String, PlayerInfo> playerInfo = new ObjectMap<>();
|
||||
private Seq<String> bannedIPs = new Seq<>();
|
||||
private Seq<String> whitelist = new Seq<>();
|
||||
private Seq<ChatFilter> chatFilters = new Seq<>();
|
||||
private Seq<ActionFilter> actionFilters = new Seq<>();
|
||||
private Seq<String> subnetBans = new Seq<>();
|
||||
private IntIntMap lastPlaced = new IntIntMap();
|
||||
|
||||
public Administration(){
|
||||
|
||||
@@ -9,6 +9,7 @@ import arc.util.*;
|
||||
import mindustry.annotations.Annotations.*;
|
||||
import mindustry.gen.*;
|
||||
import mindustry.graphics.*;
|
||||
import mindustry.logic.*;
|
||||
import mindustry.world.*;
|
||||
|
||||
public class LogicDisplay extends Block{
|
||||
@@ -37,7 +38,7 @@ public class LogicDisplay extends Block{
|
||||
public FrameBuffer buffer;
|
||||
public float color = Color.whiteFloatBits;
|
||||
public float stroke = 1f;
|
||||
public LongQueue commands = new LongQueue();
|
||||
public LongQueue commands = new LongQueue(LExecutor.maxDisplayBuffer);
|
||||
|
||||
@Override
|
||||
public void draw(){
|
||||
|
||||
Reference in New Issue
Block a user