mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-17 22:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix minor issues & cleanup

Browse Source
This commit is contained in:
dfsek
2021-01-03 20:16:59 -07:00
parent b26847f250
commit 1536a13d3c
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/java/com/dfsek/terra/generation/MasterChunkGenerator.java
+4
View File
@@ -221,4 +221,8 @@ public class MasterChunkGenerator implements TerraChunkGenerator {
} }
} }
} }
public SamplerCache getCache() {
return cache;
}
} }
common/src/main/java/com/dfsek/terra/generation/math/SamplerCache.java
+3
View File
@@ -27,6 +27,9 @@ public class SamplerCache {
return containerMap.computeIfAbsent(world.getSeed(), seed -> new Container(world)).getChunk(chunkX, chunkZ); return containerMap.computeIfAbsent(world.getSeed(), seed -> new Container(world)).getChunk(chunkX, chunkZ);
} }
public void clear() {
containerMap.clear();
}
private class Container { private class Container {
private final World world; private final World world;
platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java
+2 -2
View File
@@ -16,7 +16,6 @@ import com.dfsek.terra.api.transform.MapTransform;
import com.dfsek.terra.api.transform.Transformer; import com.dfsek.terra.api.transform.Transformer;
import com.dfsek.terra.bukkit.command.command.TerraCommand; import com.dfsek.terra.bukkit.command.command.TerraCommand;
import com.dfsek.terra.bukkit.command.command.structure.LocateCommand; import com.dfsek.terra.bukkit.command.command.structure.LocateCommand;
import com.dfsek.terra.bukkit.generator.BukkitChunkGenerator;
import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper; import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper;
import com.dfsek.terra.bukkit.handles.BukkitItemHandle; import com.dfsek.terra.bukkit.handles.BukkitItemHandle;
import com.dfsek.terra.bukkit.handles.BukkitWorldHandle; import com.dfsek.terra.bukkit.handles.BukkitWorldHandle;
@@ -61,6 +60,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
public void reload() { public void reload() {
Map<World, TerraWorld> newMap = new HashMap<>(); Map<World, TerraWorld> newMap = new HashMap<>();
worldMap.forEach((world, tw) -> { worldMap.forEach((world, tw) -> {
((MasterChunkGenerator) ((BukkitChunkGeneratorWrapper) world.getGenerator().getHandle()).getHandle()).getCache().clear();
String packID = tw.getConfig().getTemplate().getID(); String packID = tw.getConfig().getTemplate().getID();
newMap.put(world, new TerraWorld(world, registry.get(packID), this)); newMap.put(world, new TerraWorld(world, registry.get(packID), this));
}); });
@@ -167,7 +167,7 @@ public class TerraBukkitPlugin extends JavaPlugin implements TerraPlugin {
} }
public TerraWorld getWorld(World w) { public TerraWorld getWorld(World w) {
if(!(w.getGenerator() instanceof BukkitChunkGenerator)) if(!TerraWorld.isTerraWorld(w))
throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator()); throw new IllegalArgumentException("Not a Terra world! " + w.getGenerator());
if(!worlds.containsKey(w.getName())) { if(!worlds.containsKey(w.getName())) {
getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\""); getLogger().warning("Unexpected world load detected: \"" + w.getName() + "\"");