Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ServerLevelMixin::save to match the vanilla impl again #4148

Merged
merged 2 commits into from
Nov 11, 2024
Merged

Update ServerLevelMixin::save to match the vanilla impl again #4148

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823fc9e
Update ServerLevelMixin::save to match the vanilla impl again
nelind3 Nov 11, 2024
f1d9070
Remove leftover auto complete artifact
nelind3 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import net.minecraft.server.players.PlayerList;
import net.minecraft.util.ProgressListener;
import net.minecraft.world.RandomSequences;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ai.village.poi.PoiManager;
import net.minecraft.world.entity.ai.village.poi.PoiType;
import net.minecraft.world.entity.player.Player;
Expand All @@ -52,6 +53,7 @@
import net.minecraft.world.level.dimension.DimensionType;
import net.minecraft.world.level.dimension.LevelStem;
import net.minecraft.world.level.dimension.end.EndDragonFight;
import net.minecraft.world.level.entity.PersistentEntitySectionManager;
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.storage.LevelStorageSource;
Expand Down Expand Up @@ -128,6 +130,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel

// @formatter:off
@Shadow @Final private ServerLevelData serverLevelData;
@Shadow @Final private PersistentEntitySectionManager<Entity> entityManager;
@Shadow @Final private LevelTicks<Block> blockTicks;
@Shadow @Final private LevelTicks<Fluid> fluidTicks;
@Shadow private int emptyTime;
Expand Down Expand Up @@ -374,6 +377,12 @@ public void save(@Nullable final ProgressListener progress, final boolean flush,
chunkProvider.save(flush);
}

if (flush) {
this.entityManager.saveAll();
} else {
this.entityManager.autoSave();
}

Sponge.eventManager().post(SpongeEventFactory.createSaveWorldEventPost(currentCause, ((ServerWorld) this)));
}
}
Expand Down