EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Optimize generation

Browse Source
This commit is contained in:
boy0001 2015-02-28 15:59:36 +11:00
parent 12662ff61f
commit 18ab0c221e
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridGen.java
View File

@ -23,6 +23,7 @@ package com.intellectualcrafters.plot.generator;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map.Entry;
import java.util.Random; import java.util.Random;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -274,12 +275,19 @@ public class HybridGen extends PlotGenerator {
setBlock(this.result, x, y, z, this.filling); setBlock(this.result, x, y, z, this.filling);
} }
setBlock(this.result, x, this.plotheight, z, this.plotfloors); setBlock(this.result, x, this.plotheight, z, this.plotfloors);
final PlotLoc loc = new PlotLoc((short) (X + x), (short) (Z + z));
final HashMap<Short, Short> blocks = plotworld.G_SCH.get(loc);
if (blocks != null) {
for (final Entry<Short, Short> entry : blocks.entrySet()) {
setBlock(this.result, x, this.plotheight + entry.getKey(), z, entry.getValue());
}
}
} else { } else {
final PlotLoc loc = new PlotLoc((short) (X + x), (short) (Z + z)); final PlotLoc loc = new PlotLoc((short) (X + x), (short) (Z + z));
final HashMap<Short, Short> blocks = ChunkManager.GENERATE_BLOCKS.get(loc); final HashMap<Short, Short> blocks = ChunkManager.GENERATE_BLOCKS.get(loc);
if (blocks != null) { if (blocks != null) {
for (final short y : blocks.keySet()) { for (final Entry<Short, Short> entry : blocks.entrySet()) {
setBlock(this.result, x, y, z, blocks.get(y).shortValue()); setBlock(this.result, x, entry.getKey(), z, entry.getValue());
} }
} }
} }
@ -316,8 +324,8 @@ public class HybridGen extends PlotGenerator {
final PlotLoc loc = new PlotLoc((short) absX, (short) absZ); final PlotLoc loc = new PlotLoc((short) absX, (short) absZ);
final HashMap<Short, Short> blocks = this.plotworld.G_SCH.get(loc); final HashMap<Short, Short> blocks = this.plotworld.G_SCH.get(loc);
if (blocks != null) { if (blocks != null) {
for (final short y : blocks.keySet()) { for (final Entry<Short, Short> entry : blocks.entrySet()) {
setBlock(this.result, x, this.plotheight + y, z, blocks.get(y)); setBlock(this.result, x, this.plotheight + entry.getKey(), z, entry.getValue());
} }
} }
} }
@ -341,8 +349,8 @@ public class HybridGen extends PlotGenerator {
final PlotLoc loc = new PlotLoc((short) absX, (short) absZ); final PlotLoc loc = new PlotLoc((short) absX, (short) absZ);
final HashMap<Short, Short> blocks = this.plotworld.G_SCH.get(loc); final HashMap<Short, Short> blocks = this.plotworld.G_SCH.get(loc);
if (blocks != null) { if (blocks != null) {
for (final short y : blocks.keySet()) { for (final Entry<Short, Short> entry : blocks.entrySet()) {
setBlock(this.result, x, this.roadheight + y, z, blocks.get(y)); setBlock(this.result, x, this.roadheight + entry.getKey(), z, entry.getValue());
} }
} }
} }