This commit is contained in:
Daniel Mills 2020-12-06 06:30:42 -05:00
parent 30bc725631
commit a5725439ee
2 changed files with 18 additions and 19 deletions

View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.volmit</groupId>
<artifactId>Iris</artifactId>
<version>1.1.4</version>
<version>1.1.5</version>
<name>Iris</name>
<properties>
<skip.copy>false</skip.copy>

View File

@ -38,7 +38,7 @@ public class ParallaxWorld implements ParallaxAccess
{
int m = 0;
synchronized (loadedRegions)
try
{
for(ParallaxRegion i : loadedRegions.values())
{
@ -46,6 +46,11 @@ public class ParallaxWorld implements ParallaxAccess
}
}
catch(Throwable e)
{
}
return m;
}
@ -201,19 +206,16 @@ public class ParallaxWorld implements ParallaxAccess
@Override
public void cleanup(long r, long c) {
J.a(() -> {
synchronized (loadedRegions)
for(ParallaxRegion i : loadedRegions.v())
{
for(ParallaxRegion i : loadedRegions.v())
if(i.hasBeenIdleLongerThan(r))
{
if(i.hasBeenIdleLongerThan(r))
{
unload(i.getX(), i.getZ());
}
unload(i.getX(), i.getZ());
}
else
{
i.cleanup(c);
}
else
{
i.cleanup(c);
}
}
});
@ -226,16 +228,13 @@ public class ParallaxWorld implements ParallaxAccess
@Override
public synchronized void saveAllNOW() {
synchronized (loadedRegions)
for(ParallaxRegion i : loadedRegions.v())
{
for(ParallaxRegion i : loadedRegions.v())
synchronized (save)
{
synchronized (save)
if(save.contains(key(i.getX(), i.getZ())))
{
if(save.contains(key(i.getX(), i.getZ())))
{
save(i.getX(), i.getZ());
}
save(i.getX(), i.getZ());
}
}
}