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

Don't draw power beams for derelict blocks

Browse Source
This commit is contained in:
Anuken
2024-11-28 16:55:55 -05:00
parent 52eab0b0c4
commit 8672dcf9f9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/net/ArcNetProvider.java
View File

@@ -144,7 +144,7 @@ public class ArcNetProvider implements NetProvider{
@Override @Override
public void received(Connection connection, Object object){ public void received(Connection connection, Object object){
if(!(connection.getArbitraryData() instanceof ArcConnection k) || !(object instanceof Packet pack)) return; if(!(connection.getArbitraryData() instanceof ArcConnection k)) return;
if(packetSpamLimit > 0 && !k.packetRate.allow(3000, packetSpamLimit)){ if(packetSpamLimit > 0 && !k.packetRate.allow(3000, packetSpamLimit)){
Log.warn("Blacklisting IP '@' as potential DOS attack - packet spam.", k.address); Log.warn("Blacklisting IP '@' as potential DOS attack - packet spam.", k.address);
@@ -153,6 +153,8 @@ public class ArcNetProvider implements NetProvider{
return; return;
} }
if(!(object instanceof Packet pack)) return;
Core.app.post(() -> { Core.app.post(() -> {
try{ try{
net.handleServerReceived(k, pack); net.handleServerReceived(k, pack);

2
core/src/mindustry/world/blocks/power/BeamNode.java
View File

@@ -207,7 +207,7 @@ public class BeamNode extends PowerBlock{
public void draw(){ public void draw(){
super.draw(); super.draw();
if(Mathf.zero(Renderer.laserOpacity)) return; if(Mathf.zero(Renderer.laserOpacity) || team == Team.derelict) return;
Draw.z(Layer.power); Draw.z(Layer.power);
Draw.color(laserColor1, laserColor2, (1f - power.graph.getSatisfaction()) * 0.86f + Mathf.absin(3f, 0.1f)); Draw.color(laserColor1, laserColor2, (1f - power.graph.getSatisfaction()) * 0.86f + Mathf.absin(3f, 0.1f));

2
core/src/mindustry/world/blocks/power/PowerNode.java
View File

@@ -472,7 +472,7 @@ public class PowerNode extends PowerBlock{
public void draw(){ public void draw(){
super.draw(); super.draw();
if(Mathf.zero(Renderer.laserOpacity) || isPayload()) return; if(Mathf.zero(Renderer.laserOpacity) || isPayload() || team == Team.derelict) return;
Draw.z(Layer.power); Draw.z(Layer.power);
setupColor(power.graph.getSatisfaction()); setupColor(power.graph.getSatisfaction());