Repo-Mirror/HuskSync
9
0
Fork 0
mirror of https://github.com/WiIIiam278/HuskSync.git synced 2025-12-19 14:59:21 +00:00
Code Issues Releases Activity

fix: prevent race condition in CHECK_IN_PETITION handler (#614)

Browse Source 
- Replace confusing 'online' boolean with direct state checks
- Only release DATA_CHECKOUT when user is truly offline AND unlocked
This commit is contained in:
its.bread
2025-11-30 03:32:28 +08:00
committed by GitHub
parent 51a700600a
commit 5c4111b6a7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/net/william278/husksync/redis/RedisManager.java
View File

@@ -202,15 +202,19 @@ public class RedisManager extends JedisPubSub {
} }
final String payload = new String(redisMessage.getPayload(), StandardCharsets.UTF_8); final String payload = new String(redisMessage.getPayload(), StandardCharsets.UTF_8);
final User user = new User(UUID.fromString(payload.split("/")[0]), payload.split("/")[1]); final User user = new User(UUID.fromString(payload.split("/")[0]), payload.split("/")[1]);
boolean online = plugin.getDisconnectingPlayers().contains(user.getUuid())
|| plugin.getOnlineUser(user.getUuid()).isEmpty(); // Only release checkout if user is truly offline AND not being processed
if (!online && !plugin.isLocked(user.getUuid())) { final boolean isOnline = plugin.getOnlineUser(user.getUuid()).isPresent();
plugin.debug("[%s] Received check-in petition for online/unlocked user, ignoring" final boolean isLocked = plugin.isLocked(user.getUuid());
.formatted(user.getName()));
if (isOnline || isLocked) {
plugin.debug("[%s] Petition ignored - user still being processed (online=%s, locked=%s)"
.formatted(user.getName(), isOnline, isLocked));
return; return;
} }
plugin.getRedisManager().setUserCheckedOut(user, false); plugin.getRedisManager().setUserCheckedOut(user, false);
plugin.debug("[%s] Received petition for offline user, checking them in".formatted(user.getName())); plugin.debug("[%s] Petition accepted - user checked in".formatted(user.getName()));
} }
case RETURN_USER_DATA -> { case RETURN_USER_DATA -> {
final UUID target = redisMessage.getTargetUuid().orElse(null); final UUID target = redisMessage.getTargetUuid().orElse(null);