EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

PlotBlock cache / events / flags

Browse Source
This commit is contained in:
Jesse Boyd
2016-06-04 06:20:13 +10:00
parent f84766074e
commit ca5d3a818b
26 changed files with 171 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sponge/src/main/java/com/plotsquared/sponge/util/SpongeUtil.java
View File

@ -153,7 +153,7 @@ public class SpongeUtil extends WorldUtil {
if (state.getType() == BlockTypes.AIR) {
continue;
}
PlotBlock plotBlock = new PlotBlock((short) (i & 0xFFF), (byte) (i >> 12 & 0xF));
PlotBlock plotBlock = PlotBlock.get((short) (i & 0xFFF), (byte) (i >> 12 & 0xF));
stateArray[i] = state;
stateMap.put(state, plotBlock);
} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) {
@ -301,7 +301,7 @@ public class SpongeUtil extends WorldUtil {
match = comparison.match;
id = SpongeUtil.getPlotBlock(comparison.best.getDefaultState()).id;
}
PlotBlock block = new PlotBlock(id, data);
PlotBlock block = PlotBlock.get(id, data);
StringComparison<PlotBlock> outer = new StringComparison<PlotBlock>();
return outer.new ComparisonResult(match, block);

2
Sponge/src/main/java/com/plotsquared/sponge/util/block/SlowChunk.java
View File

@ -39,7 +39,7 @@ public class SlowChunk extends PlotChunk<Chunk> {
if (id == this.lastBlock.id && data == this.lastBlock.data) {
this.result[MainUtil.CACHE_I[x][y][z]][MainUtil.CACHE_J[x][y][z]] = this.lastBlock;
} else {
this.result[MainUtil.CACHE_I[x][y][z]][MainUtil.CACHE_J[x][y][z]] = new PlotBlock((short) id, data);
this.result[MainUtil.CACHE_I[x][y][z]][MainUtil.CACHE_J[x][y][z]] = PlotBlock.get((short) id, data);
}
}