mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-07-20 04:37:31 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash

Browse Source
This commit is contained in:
Anuken
2019-05-10 13:42:04 -04:00
parent 064a012b25
commit d6be07f1b8
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/core/World.java
View File

@ -494,7 +494,7 @@ public class World implements ApplicationListener{
@Override
public Tile create(int x, int y, int floorID, int overlayID, int wallID){
return new Tile(x, y, floorID, overlayID, wallID);
return (tiles[x][y] = new Tile(x, y, floorID, overlayID, wallID));
}
@Override

2
core/src/io/anuke/mindustry/editor/MapEditor.java
View File

@ -286,7 +286,7 @@ public class MapEditor{
@Override
public Tile create(int x, int y, int floorID, int overlayID, int wallID){
return new EditorTile(x, y, floorID, overlayID, wallID);
return (tiles()[x][y] = new EditorTile(x, y, floorID, overlayID, wallID));
}
@Override

8
core/src/io/anuke/mindustry/io/SaveVersion.java
View File

@ -8,6 +8,7 @@ import io.anuke.mindustry.entities.Entities;
import io.anuke.mindustry.entities.EntityGroup;
import io.anuke.mindustry.entities.traits.*;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.world.*;
@ -70,6 +71,12 @@ public abstract class SaveVersion extends SaveFileReader{
state.wavetime = map.getFloat("wavetime", state.rules.waveSpacing);
state.stats = JsonIO.read(Stats.class, map.get("stats", "{}"));
state.rules = JsonIO.read(Rules.class, map.get("rules", "{}"));
Map worldmap = world.maps.byName(map.get("mapname", "\\\\\\"));
world.setMap(worldmap == null ? new Map(StringMap.of(
"name", map.get("mapname", "Unknown"),
"width", 1,
"height", 1
)) : worldmap);
}
public void writeMap(DataOutput stream) throws IOException{
@ -136,7 +143,6 @@ public abstract class SaveVersion extends SaveFileReader{
if(!generating) context.begin();
//Tile[][] tiles = world.createTiles(width, height);
context.resize(width, height);
//read floor and create tiles first