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

refactor: place checkin petitions behind experimental setting

Browse Source
This commit is contained in:
William278
2025-06-13 17:51:09 +01:00
parent 554fac89c0
commit 8f2d1c7298
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/net/william278/husksync/config/Settings.java
View File

@@ -150,7 +150,7 @@ public class Settings {
} }
} }
// 𝓡𝓮𝓭𝓲𝓼 settings // Redis settings
@Comment("Redis settings") @Comment("Redis settings")
private RedisSettings redis = new RedisSettings(); private RedisSettings redis = new RedisSettings();
@@ -321,6 +321,9 @@ public class Settings {
@Getter(AccessLevel.NONE) @Getter(AccessLevel.NONE)
private Map<String, String> eventPriorities = EventListener.ListenerType.getDefaults(); private Map<String, String> eventPriorities = EventListener.ListenerType.getDefaults();
@Comment("Enable checkin petitions for data syncing (experimental)")
private boolean checkinPetitions = false;
public boolean doAutoPin(@NotNull DataSnapshot.SaveCause cause) { public boolean doAutoPin(@NotNull DataSnapshot.SaveCause cause) {
return autoPinnedSaveCauses.contains(cause.name()); return autoPinnedSaveCauses.contains(cause.name());
} }

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

@@ -177,7 +177,8 @@ public class RedisManager extends JedisPubSub {
).dispatch(plugin, RedisMessage.Type.RETURN_USER_DATA) ).dispatch(plugin, RedisMessage.Type.RETURN_USER_DATA)
); );
case CHECK_IN_PETITION -> { case CHECK_IN_PETITION -> {
if (!redisMessage.isTargetServer(plugin)) { if (!redisMessage.isTargetServer(plugin)
|| !plugin.getSettings().getSynchronization().isCheckinPetitions()) {
return; return;
} }
final String payload = new String(redisMessage.getPayload(), StandardCharsets.UTF_8); final String payload = new String(redisMessage.getPayload(), StandardCharsets.UTF_8);

3
common/src/main/java/net/william278/husksync/sync/LockstepDataSyncer.java
View File

@@ -53,7 +53,8 @@ public class LockstepDataSyncer extends DataSyncer {
// If they are checked out, ask the server to check them back in and return false // If they are checked out, ask the server to check them back in and return false
final Optional<String> server = getRedis().getUserCheckedOut(user); final Optional<String> server = getRedis().getUserCheckedOut(user);
if (server.isPresent() && !server.get().equals(plugin.getServerName())) { if (plugin.getSettings().getSynchronization().isCheckinPetitions()
&& server.isPresent() && !server.get().equals(plugin.getServerName())) {
getRedis().petitionServerCheckin(server.get(), user); getRedis().petitionServerCheckin(server.get(), user);
return false; return false;
} }