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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-08-22 10:21:24 -04:00
parent 50d01ef6f8 b860b2bbfb
commit 9c826a5fdd
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/Blocks.java
View File

@@ -2083,11 +2083,15 @@ public class Blocks implements ContentList{
payloadSource = new PayloadSource("payload-source"){{ payloadSource = new PayloadSource("payload-source"){{
requirements(Category.units, BuildVisibility.sandboxOnly, with()); requirements(Category.units, BuildVisibility.sandboxOnly, with());
size = 5; size = 5;
alwaysUnlocked = true;
group = BlockGroup.units;
}}; }};
payloadVoid = new PayloadVoid("payload-void"){{ payloadVoid = new PayloadVoid("payload-void"){{
requirements(Category.units, BuildVisibility.sandboxOnly, with()); requirements(Category.units, BuildVisibility.sandboxOnly, with());
size = 5; size = 5;
alwaysUnlocked = true;
group = BlockGroup.units;
}}; }};
//TODO move //TODO move

1
core/src/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -55,6 +55,7 @@ public class CoreBlock extends StorageBlock{
envEnabled = Env.any; envEnabled = Env.any;
drawDisabled = false; drawDisabled = false;
replaceable = false; replaceable = false;
rebuildable = false;
} }
@Remote(called = Loc.server) @Remote(called = Loc.server)