twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 04:05:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Optimized blockCache, now only stores blocks asked for

Browse Source 
By: Erik Broes <erikbroes@grum.nl>
This commit is contained in:
CraftBukkit/Spigot
2011-01-30 20:19:56 +01:00
parent 922b141e94
commit 71abdb0010
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -83,20 +83,22 @@ public class CraftWorld implements World {
} }
public Block updateBlock(int x, int y, int z) { public void updateBlock(int x, int y, int z, Integer type, Integer data) {
BlockCoordinate loc = new BlockCoordinate(x, y, z); BlockCoordinate loc = new BlockCoordinate(x, y, z);
CraftBlock block = (CraftBlock)blockCache.get(loc); CraftBlock block = (CraftBlock) blockCache.get(loc);
final int type = world.getTypeId(x, y, z);
final byte data = (byte)world.getData(x, y, z);
if (block == null) { if (block == null) {
block = new CraftBlock(this, x, y, z, type, data); return;
blockCache.put(loc, block);
} else {
block.update();
} }
return block; if (type == null) {
type = world.getTypeId(x, y, z);
}
if (data == null) {
data = world.getData(x, y, z);
}
block.update(type, data.byteValue());
} }
public CraftChunk updateChunk(int x, int z) { public CraftChunk updateChunk(int x, int z) {

10
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@@ -346,9 +346,13 @@ public class CraftBlock implements Block {
return world.getHandle().p(x, y, z); return world.getHandle().p(x, y, z);
} }
public void update() { public void update(int type, byte data) {
type = world.getHandle().getTypeId(x, y, z); this.type = type;
data = (byte)world.getHandle().getData(x, y, z); this.data = data;
light = (byte)world.getHandle().j(x, y, z); light = (byte)world.getHandle().j(x, y, z);
} }
public void update() {
this.update( world.getHandle().getTypeId(x, y, z), (byte)world.getHandle().getData(x, y, z));
}
} }