Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #2424

Browse Source
This commit is contained in:
Anuken
2020-08-25 19:46:14 -04:00
parent c191dd8855
commit 6a23439fce
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/logic/LExecutor.java
View File

@@ -21,7 +21,8 @@ public class LExecutor{
varTime = 1; varTime = 1;
public static final int public static final int
maxGraphicsBuffer = 512, maxGraphicsBuffer = 256,
maxDisplayBuffer = 512,
maxTextBuffer = 256; maxTextBuffer = 256;
public LInstruction[] instructions = {}; public LInstruction[] instructions = {};
@@ -462,8 +463,10 @@ public class LExecutor{
Building build = exec.building(target); Building build = exec.building(target);
if(build instanceof LogicDisplayBuild){ if(build instanceof LogicDisplayBuild){
LogicDisplayBuild d = (LogicDisplayBuild)build; LogicDisplayBuild d = (LogicDisplayBuild)build;
for(int i = 0; i < exec.graphicsBuffer.size; i++){ if(d.commands.size + exec.graphicsBuffer.size < maxDisplayBuffer){
d.commands.addLast(exec.graphicsBuffer.items[i]); for(int i = 0; i < exec.graphicsBuffer.size; i++){
d.commands.addLast(exec.graphicsBuffer.items[i]);
}
} }
exec.graphicsBuffer.clear(); exec.graphicsBuffer.clear();
} }

13
core/src/mindustry/net/Administration.java
View File

@@ -19,13 +19,14 @@ import static mindustry.Vars.*;
import static mindustry.game.EventType.*; import static mindustry.game.EventType.*;
public class Administration{ 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 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(); private IntIntMap lastPlaced = new IntIntMap();
public Administration(){ public Administration(){

3
core/src/mindustry/world/blocks/logic/LogicDisplay.java
View File

@@ -9,6 +9,7 @@ import arc.util.*;
import mindustry.annotations.Annotations.*; import mindustry.annotations.Annotations.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.logic.*;
import mindustry.world.*; import mindustry.world.*;
public class LogicDisplay extends Block{ public class LogicDisplay extends Block{
@@ -37,7 +38,7 @@ public class LogicDisplay extends Block{
public FrameBuffer buffer; public FrameBuffer buffer;
public float color = Color.whiteFloatBits; public float color = Color.whiteFloatBits;
public float stroke = 1f; public float stroke = 1f;
public LongQueue commands = new LongQueue(); public LongQueue commands = new LongQueue(LExecutor.maxDisplayBuffer);
@Override @Override
public void draw(){ public void draw(){