wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of gitlab.com:distant-horizons-team/distant-horizons-core

Browse Source
This commit is contained in:
James Seibel
2025-01-14 07:03:39 -06:00
parent 1913e09303 863bfbaff5
commit f3368f5a07
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/FullDataSourceRequestHandler.java
+11 -5
View File
@@ -85,6 +85,8 @@ public class FullDataSourceRequestHandler
{
try (FullDataPayload payload = new FullDataPayload(fullDataSource, this.getAllBeamsForPos(message.sectionPos)))
{
fullDataSource.close();
serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () ->
{
message.sendResponse(new FullDataSourceResponseMessage(payload));
@@ -203,6 +205,8 @@ public class FullDataSourceRequestHandler
{
try (FullDataPayload payload = new FullDataPayload(requestGroup.fullDataSource, this.getAllBeamsForPos(entry.getKey())))
{
requestGroup.fullDataSource.close();
for (DataSourceRequestGroup.RequestData requestData : requestGroup.requestMessages.values())
{
this.requestGroupsByFutureId.remove(requestData.futureId());
@@ -224,12 +228,14 @@ public class FullDataSourceRequestHandler
if (this.fullDataSourceProvider().isFullyGenerated(fullDataSource.columnGenerationSteps))
{
requestGroup.fullDataSource = fullDataSource;
return;
}
else if (
DhSectionPos.getDetailLevel(pos) > (Config.Common.WorldGenerator.distantGeneratorMode.get() == EDhApiDistantGeneratorMode.INTERNAL_SERVER
? DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL
: this.serverLevel.serverside.fullDataFileHandler.lowestDataDetailLevel())
)
fullDataSource.close();
if (DhSectionPos.getDetailLevel(pos) > (Config.Common.WorldGenerator.distantGeneratorMode.get() == EDhApiDistantGeneratorMode.INTERNAL_SERVER
? DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL
: this.serverLevel.serverside.fullDataFileHandler.lowestDataDetailLevel()))
{
// Make this group unavailable for adding into
this.requestGroupsByPos.remove(pos);