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

Merge branch 'master' into zh-tw

Browse Source
This commit is contained in:
William
2022-07-13 12:24:21 +01:00
parent 7ae0709895 ebf5b77f00
commit 460cb54a7d
7 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/net/william278/husksync/config/Locales.java
View File

@@ -18,7 +18,7 @@ public class Locales {
[HuskSync](#00fb9a bold) [| Version %version%](#00fb9a)
[A modern, cross-server player data synchronization system](gray)
[• Author:](white) [William278](gray show_text=&7Click to visit website open_url=https://william278.net)
[• Contributors:](white) [HarvelsX](gray show_text=&7Code)
[• Contributors:](white) [HarvelsX](gray show_text=&7Code), [HookWoods](gray show_text=&7Code)
[• Translators:](white) [Namiu](gray show_text=&7\\(うにたろう\\) - Japanese, ja-jp), [anchelthe](gray show_text=&7Spanish, es-es), [Melonzio](gray show_text=&7Spanish, es-es), [Ceddix](gray show_text=&7German, de-de), [mateusneresrb](gray show_text=&7Brazilian Portuguese, pt-br], [小蔡](gray show_text=&7Traditional Chinese, zh-tw), [Ghost-chu](gray show_text=&7Simplified Chinese, zh-cn), [DJelly4K](gray show_text=&7Simplified Chinese, zh-cn), [Thourgard](gray show_text=&7Ukrainian, uk-ua), [xF3d3](gray show_text=&7Italian, it-it)
[• Documentation:](white) [[Link]](#00fb9a show_text=&7Click to open link open_url=https://william278.net/docs/husksync/Home/)
[• Bug reporting:](white) [[Link]](#00fb9a show_text=&7Click to open link open_url=https://github.com/WiIIiam278/HuskSync/issues)

3
common/src/main/java/net/william278/husksync/listener/EventListener.java
View File

@@ -50,9 +50,6 @@ public abstract class EventListener {
* @param user The {@link OnlineUser} to handle
*/
protected final void handlePlayerJoin(@NotNull OnlineUser user) {
if (user.isDead()) {
return;
}
usersAwaitingSync.add(user.uuid);
CompletableFuture.runAsync(() -> {
try {

9
common/src/main/java/net/william278/husksync/player/OnlineUser.java
View File

@@ -149,13 +149,6 @@ public abstract class OnlineUser extends User {
*/
public abstract CompletableFuture<Void> setPersistentDataContainer(@NotNull PersistentDataContainerData persistentDataContainerData);
/**
* Indicates if the player is currently dead
*
* @return {@code true} if the player is dead ({@code health <= 0}); {@code false} otherwise
*/
public abstract boolean isDead();
/**
* Indicates if the player has gone offline
*
@@ -192,7 +185,7 @@ public abstract class OnlineUser extends User {
final PreSyncEvent preSyncEvent = (PreSyncEvent) eventCannon.firePreSyncEvent(this, data).join();
final UserData finalData = preSyncEvent.getUserData();
final List<CompletableFuture<Void>> dataSetOperations = new ArrayList<>() {{
if (!isOffline() && !isDead() && !preSyncEvent.isCancelled()) {
if (!isOffline() && !preSyncEvent.isCancelled()) {
if (settings.getBooleanValue(Settings.ConfigOption.SYNCHRONIZATION_SYNC_INVENTORIES)) {
add(setInventory(finalData.getInventoryData()));
}

5
common/src/test/java/net/william278/husksync/player/DummyPlayer.java
View File

@@ -124,11 +124,6 @@ public class DummyPlayer extends OnlineUser {
});
}
@Override
public boolean isDead() {
return false;
}
@Override
public boolean isOffline() {
return false;