mirror of
https://github.com/PixelGuys/Cubyz.git
synced 2025-08-03 19:28:49 -04:00
Remove markEdit and fix spawn chunk not loaded bug
This commit is contained in:
parent
0a91c172b2
commit
331f9b2a78
@ -11,21 +11,6 @@ import io.cubyz.entity.Player;
|
|||||||
|
|
||||||
// TODO
|
// TODO
|
||||||
public class RemoteWorld extends World {
|
public class RemoteWorld extends World {
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isEdited() {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unmarkEdit() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void markEdit() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Player getLocalPlayer() {
|
public Player getLocalPlayer() {
|
||||||
|
@ -119,7 +119,6 @@ public class Chunk {
|
|||||||
inst = new BlockInstance[16][World.WORLD_HEIGHT][16];
|
inst = new BlockInstance[16][World.WORLD_HEIGHT][16];
|
||||||
}
|
}
|
||||||
inst[rx][y][rz] = inst0;
|
inst[rx][y][rz] = inst0;
|
||||||
world.markEdit();
|
|
||||||
if(generated) {
|
if(generated) {
|
||||||
BlockInstance[] neighbors = inst0.getNeighbors();
|
BlockInstance[] neighbors = inst0.getNeighbors();
|
||||||
for (int i = 0; i < neighbors.length; i++) {
|
for (int i = 0; i < neighbors.length; i++) {
|
||||||
@ -203,7 +202,6 @@ public class Chunk {
|
|||||||
updatables.add(bi);
|
updatables.add(bi);
|
||||||
}*/
|
}*/
|
||||||
}
|
}
|
||||||
world.markEdit();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -272,7 +270,6 @@ public class Chunk {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
world.markEdit();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -352,7 +349,6 @@ public class Chunk {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
world.markEdit();
|
|
||||||
inst[x][y][z] = null;
|
inst[x][y][z] = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,6 @@ public class LocalWorld extends World {
|
|||||||
|
|
||||||
//private List<BlockInstance> spatials = new ArrayList<>();
|
//private List<BlockInstance> spatials = new ArrayList<>();
|
||||||
private Block [] blocks;
|
private Block [] blocks;
|
||||||
private boolean edited;
|
|
||||||
private Player player;
|
private Player player;
|
||||||
|
|
||||||
private WorldIO wio;
|
private WorldIO wio;
|
||||||
@ -87,21 +86,6 @@ public class LocalWorld extends World {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isEdited() {
|
|
||||||
return edited;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void unmarkEdit() {
|
|
||||||
edited = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void markEdit() {
|
|
||||||
edited = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public LocalWorld() {
|
public LocalWorld() {
|
||||||
name = "World";
|
name = "World";
|
||||||
chunks = new ArrayList<>();
|
chunks = new ArrayList<>();
|
||||||
@ -158,7 +142,7 @@ public class LocalWorld extends World {
|
|||||||
Chunk ch = getChunk(x / 16, z / 16);
|
Chunk ch = getChunk(x / 16, z / 16);
|
||||||
if (!ch.isGenerated()) {
|
if (!ch.isGenerated()) {
|
||||||
synchronousGenerate(ch);
|
synchronousGenerate(ch);
|
||||||
ch.setLoaded(true);
|
ch.load();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,24 +43,6 @@ public abstract class World {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Used internally, allow the client to know whether or not it should update the visible blocks list.
|
|
||||||
* Mostly unused since recently.
|
|
||||||
*/
|
|
||||||
public abstract boolean isEdited();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used internally, allow the client to know whether or not it should update the visible blocks list.
|
|
||||||
* Mostly unused since recently.
|
|
||||||
*/
|
|
||||||
public abstract void unmarkEdit();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Used internally, allow the client to know whether or not it should update the visible blocks list.
|
|
||||||
* Mostly unused since recently.
|
|
||||||
*/
|
|
||||||
public abstract void markEdit();
|
|
||||||
|
|
||||||
public abstract Player getLocalPlayer();
|
public abstract Player getLocalPlayer();
|
||||||
|
|
||||||
public int getHeight() {
|
public int getHeight() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user