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

Fix chunk force ticking #1738

Merged
merged 2 commits into from
Dec 14, 2024
Merged

Fix chunk force ticking #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b40df5
Fix chunk force ticking
Matyrobbrt Dec 4, 2024
6f79918
Move check
Matyrobbrt Dec 12, 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
21 changes: 21 additions & 0 deletions patches/net/minecraft/server/level/ChunkMap.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,27 @@
p_294215_.connection.chunkSender.dropChunk(p_294215_, p_294758_);
}

@@ -955,6 +_,20 @@
}
}

+ void collectForceTickingChunks(List<LevelChunk> list) {
+ var itr = distanceManager.forcedTickets.long2ObjectEntrySet().fastIterator();
+ while (itr.hasNext()) {
+ var entry = itr.next();
+ ChunkHolder holder = this.visibleChunkMap.get(entry.getLongKey());
+ if (holder != null && !entry.getValue().isEmpty()) {
+ var chunk = holder.getTickingChunk();
+ if (chunk != null) {
+ list.add(chunk);
+ }
+ }
+ }
+ }
+
boolean anyPlayerCloseEnoughForSpawning(ChunkPos p_183880_) {
return !this.distanceManager.hasPlayersNearby(p_183880_.toLong()) ? false : this.anyPlayerCloseEnoughForSpawningInternal(p_183880_);
}
@@ -1059,6 +_,7 @@
this.playerMap.unIgnorePlayer(p_140185_);
}
Expand Down
18 changes: 9 additions & 9 deletions patches/net/minecraft/server/level/DistanceManager.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
final Executor mainThreadExecutor;
private long ticketTickCounter;
private int simulationDistance = 10;
+ private final Long2ObjectOpenHashMap<SortedArraySet<Ticket<?>>> forcedTickets = new Long2ObjectOpenHashMap<>();
+ final Long2ObjectOpenHashMap<SortedArraySet<Ticket<?>>> forcedTickets = new Long2ObjectOpenHashMap<>();

protected DistanceManager(Executor p_140774_, Executor p_140775_) {
TaskScheduler<Runnable> taskscheduler = TaskScheduler.wrapExecutor("player ticket throttler", p_140775_);
Expand All @@ -13,8 +13,8 @@
this.ticketTracker.update(p_140785_, p_140786_.getTicketLevel(), true);
}
+ if (p_140786_.isForceTicks()) {
+ SortedArraySet<Ticket<?>> tickets = forcedTickets.computeIfAbsent(p_140785_, e -> SortedArraySet.create(4));
+ tickets.addOrGet(ticket);
+ SortedArraySet<Ticket<?>> tickets = forcedTickets.computeIfAbsent(p_140785_, e -> SortedArraySet.create(4));
+ tickets.addOrGet(ticket);
+ }
}

Expand All @@ -25,10 +25,10 @@
this.ticketTracker.update(p_140819_, getTicketLevelAt(sortedarrayset), false);
+
+ if (p_140820_.isForceTicks()) {
+ SortedArraySet<Ticket<?>> tickets = forcedTickets.get(p_140819_);
+ if (tickets != null) {
+ tickets.remove(p_140820_);
+ }
+ SortedArraySet<Ticket<?>> tickets = forcedTickets.get(p_140819_);
+ if (tickets != null) {
+ tickets.remove(p_140820_);
+ }
+ }
}

Expand Down Expand Up @@ -63,8 +63,8 @@
+ }
+
+ public boolean shouldForceTicks(long chunkPos) {
+ SortedArraySet<Ticket<?>> tickets = forcedTickets.get(chunkPos);
+ return tickets != null && !tickets.isEmpty();
+ SortedArraySet<Ticket<?>> tickets = forcedTickets.get(chunkPos);
+ return tickets != null && !tickets.isEmpty();
}

private void dumpTickets(String p_143208_) {
8 changes: 6 additions & 2 deletions patches/net/minecraft/server/level/ServerChunkCache.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,19 @@
ChunkAccess chunkaccess1 = chunkholder.getChunkIfPresent(ChunkStatus.FULL);
if (chunkaccess1 != null) {
this.storeInCache(i, chunkaccess1, ChunkStatus.FULL);
@@ -384,7 +_,7 @@
@@ -384,10 +_,11 @@
private void collectTickingChunks(List<LevelChunk> p_363421_) {
this.chunkMap.forEachSpawnCandidateChunk(p_381767_ -> {
LevelChunk levelchunk = p_381767_.getTickingChunk();
- if (levelchunk != null && this.level.isNaturalSpawningAllowed(p_381767_.getPos())) {
+ if (levelchunk != null && this.level.isNaturalSpawningAllowed(p_381767_.getPos()) || this.distanceManager.shouldForceTicks(p_381767_.getPos().toLong())) {
+ if (levelchunk != null && this.level.isNaturalSpawningAllowed(p_381767_.getPos()) && !this.distanceManager.shouldForceTicks(p_381767_.getPos().toLong())) { // Neo: we add force ticked chunks in the list below
p_363421_.add(levelchunk);
}
});
+ chunkMap.collectForceTickingChunks(p_363421_);
}

private void tickChunks(ProfilerFiller p_364065_, long p_361343_, List<LevelChunk> p_360873_) {
@@ -480,11 +_,17 @@
}

Expand Down
Loading