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

Changed BlockPlan#block to Block

Browse Source
This commit is contained in:
Anuken
2025-01-12 09:01:14 -05:00
parent 4648371383
commit aadb994bdc
12 changed files with 109 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/io/SaveVersion.java
View File

@@ -368,7 +368,7 @@ public abstract class SaveVersion extends SaveFileReader{
stream.writeShort(block.x);
stream.writeShort(block.y);
stream.writeShort(block.rotation);
stream.writeShort(block.block);
stream.writeShort(block.block.id);
TypeIO.writeObject(Writes.get(stream), block.config);
}
}
@@ -426,7 +426,7 @@ public abstract class SaveVersion extends SaveFileReader{
var obj = TypeIO.readObject(reads);
//cannot have two in the same position
if(set.add(Point2.pack(x, y))){
data.plans.addLast(new BlockPlan(x, y, rot, content.block(bid).id, obj));
data.plans.addLast(new BlockPlan(x, y, rot, content.block(bid), obj));
}
}
}

2
core/src/mindustry/io/versions/Save3.java
View File

@@ -21,7 +21,7 @@ public class Save3 extends LegacySaveVersion{
TeamData data = team.data();
int blocks = stream.readInt();
for(int j = 0; j < blocks; j++){
data.plans.addLast(new BlockPlan(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()).id, stream.readInt()));
data.plans.addLast(new BlockPlan(stream.readShort(), stream.readShort(), stream.readShort(), content.block(stream.readShort()), stream.readInt()));
}
}