mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 10:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Hotswapping of worlds

Browse Source
This commit is contained in:
DanLT 2021-06-23 21:13:27 -08:00
parent 63f5c240a4
commit 7ba051c7ff
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java
View File

@ -45,6 +45,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
private int lgenerated = 0; private int lgenerated = 0;
private final KMap<Long, PregeneratedData> chunkCache; private final KMap<Long, PregeneratedData> chunkCache;
private ChronoLatch hotloadcd; private ChronoLatch hotloadcd;
private AtomicBoolean fake;
@Getter @Getter
private double generatedPerSecond = 0; private double generatedPerSecond = 0;
private int art; private int art;
@ -57,6 +58,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
public EngineCompositeGenerator(String query, boolean production) { public EngineCompositeGenerator(String query, boolean production) {
super(); super();
chunkCache = new KMap<>(); chunkCache = new KMap<>();
fake = new AtomicBoolean(true);
hotloadcd = new ChronoLatch(3500); hotloadcd = new ChronoLatch(3500);
mst = M.ms(); mst = M.ms();
this.production = production; this.production = production;
@ -285,13 +287,27 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce
} }
public synchronized void initialize(World world) { public synchronized void initialize(World world) {
if(!(world instanceof FakeWorld) && fake.get())
{
fake.set(false);
this.compound.updateWorld(world);
getTarget().updateWorld(world);
for(int i = 0; i < getComposite().getSize(); i++)
{
getComposite().getEngine(i).getTarget().updateWorld(world);
}
Iris.info("Attached Real World to Engine Target");
}
if (initialized.get()) { if (initialized.get()) {
return; return;
} }
initialized.set(true);
try try
{ {
initialized.set(true);
IrisDimension dim = getDimension(world); IrisDimension dim = getDimension(world);
IrisDataManager data = production ? new IrisDataManager(getDataFolder(world)) : dim.getLoader().copy(); IrisDataManager data = production ? new IrisDataManager(getDataFolder(world)) : dim.getLoader().copy();
compound = new IrisEngineCompound(world, dim, data, Iris.getThreadCount()); compound = new IrisEngineCompound(world, dim, data, Iris.getThreadCount());

2
src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java
View File

@ -149,4 +149,6 @@ public interface EngineCompound extends Listener, Hotloadable, DataProvider
return v.v(); return v.v();
} }
void updateWorld(World world);
} }