Skip to content

Commit 4ecab68

Browse files
authored
PICK fix from bp146
1 parent 00a4c06 commit 4ecab68

File tree

1 file changed

+51
-0
lines changed

1 file changed

+51
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: way-zer <[email protected]>
3+
Date: Sun, 17 Nov 2024 20:45:08 +0800
4+
Subject: [PATCH] FIX.G filter air BuildPayload
5+
6+
---
7+
core/src/mindustry/world/blocks/payloads/Constructor.java | 3 +++
8+
core/src/mindustry/world/blocks/payloads/Payload.java | 1 +
9+
core/src/mindustry/world/blocks/payloads/PayloadSource.java | 3 +++
10+
3 files changed, 7 insertions(+)
11+
12+
diff --git a/core/src/mindustry/world/blocks/payloads/Constructor.java b/core/src/mindustry/world/blocks/payloads/Constructor.java
13+
index 695600afddc6687abe526813f8c6f07fadbf2083..c515d2c0863b895c208646e4b718b14e4880215b 100644
14+
--- a/core/src/mindustry/world/blocks/payloads/Constructor.java
15+
+++ b/core/src/mindustry/world/blocks/payloads/Constructor.java
16+
@@ -89,6 +89,9 @@ public class Constructor extends BlockProducer{
17+
public void read(Reads read, byte revision){
18+
super.read(read, revision);
19+
recipe = Vars.content.block(read.s());
20+
+ if(recipe != null && recipe.isAir()){
21+
+ recipe = null;
22+
+ }
23+
}
24+
}
25+
}
26+
diff --git a/core/src/mindustry/world/blocks/payloads/Payload.java b/core/src/mindustry/world/blocks/payloads/Payload.java
27+
index 218fab7192939e87af189f3c4d3dabb53726ec86..68256e8cb6d40227659633fd8e9544732b0be686 100644
28+
--- a/core/src/mindustry/world/blocks/payloads/Payload.java
29+
+++ b/core/src/mindustry/world/blocks/payloads/Payload.java
30+
@@ -95,6 +95,7 @@ public interface Payload extends Position{
31+
byte version = read.b();
32+
payload.build.readAll(read, version);
33+
payload.build.tile = emptyTile;
34+
+ if(block.isAir()) return null;
35+
return (T)payload;
36+
}else if(type == payloadUnit){
37+
byte id = read.b();
38+
diff --git a/core/src/mindustry/world/blocks/payloads/PayloadSource.java b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
39+
index 8e90508e6103c20df6ddf0b831eb54fa38f012fc..8e8de3400a383e24dd64013253307778d4212696 100644
40+
--- a/core/src/mindustry/world/blocks/payloads/PayloadSource.java
41+
+++ b/core/src/mindustry/world/blocks/payloads/PayloadSource.java
42+
@@ -167,6 +167,9 @@ public class PayloadSource extends PayloadBlock{
43+
super.read(read, revision);
44+
unit = Vars.content.unit(read.s());
45+
configBlock = Vars.content.block(read.s());
46+
+ if(configBlock!=null&&configBlock.isAir()){
47+
+ configBlock = null;
48+
+ }
49+
}
50+
}
51+
}

0 commit comments

Comments
 (0)