Skip to content

Ensure NearbyPlayers add/remove operations running on main #779

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

Draft
HaHaWTH wants to merge 1 commit into
base: ver/1.21.11
Choose a base branch
from
Draft

Ensure NearbyPlayers add/remove operations running on main #779

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 26 additions & 0 deletions ...inecraft-patches/features/0336-Ensure-NearbyPlayers-add-remove-operations-running-o.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
Date: Thu, 4 Mar 2077 00:00:00 +0800
Subject: [PATCH] Ensure NearbyPlayers add/remove operations running on main


diff --git a/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java b/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java
index 499cad369242f9ad724b3251538d62d8dc8d2ec8..5582cfa64da3ba6d451b0c0472820766d066212b 100644
--- a/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java
+++ b/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java
@@ -190,6 +190,7 @@ public final class NearbyPlayers {
}

public void addPlayer(final ServerPlayer player, final NearbyMapType type) {
+ ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Add player to NearbyPlayers off-main"); // Leaf - Ensure tick thread
++this.updateCount;

final int idx = type.ordinal();
@@ -214,6 +215,7 @@ public final class NearbyPlayers {
}

public void removePlayer(final ServerPlayer player, final NearbyMapType type) {
+ ca.spottedleaf.moonrise.common.util.TickThread.ensureTickThread("Remove player from NearbyPlayers off-main"); // Leaf - Ensure tick thread
++this.updateCount;

final int idx = type.ordinal();