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

Merge branch '6.0' of https://github.com/Anuken/Mindustry into object-config

Browse Source 
# Conflicts:
#	core/src/mindustry/entities/traits/BuilderTrait.java
#	core/src/mindustry/entities/type/TileEntity.java
#	core/src/mindustry/game/EventType.java
#	core/src/mindustry/game/Schematics.java
#	core/src/mindustry/input/InputHandler.java
#	core/src/mindustry/io/TypeIO.java
#	core/src/mindustry/world/Block.java
#	core/src/mindustry/world/blocks/distribution/Sorter.java
This commit is contained in:
Anuken
2020-03-04 08:38:36 -05:00
parent 2581353c5e
commit aeae286273
19 changed files with 55 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/game/Schematic.java
View File

@@ -116,10 +116,10 @@ public class Schematic implements Publishable, Comparable<Schematic>{
public static class Stile{
public @NonNull Block block;
public short x, y;
public int config;
public Object config;
public byte rotation;
public Stile(Block block, int x, int y, int config, byte rotation){
public Stile(Block block, int x, int y, Object config, byte rotation){
this.block = block;
this.x = (short)x;
this.y = (short)y;