ineanto/nicko
1
0
Fork 0
Code Issues Pull requests Activity

fix: make players disguise on join

Browse source
This commit is contained in:
ineanto 2023-12-06 22:35:31 +01:00
parent 4f8c3c9eec
commit 99e7dd439a
2 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java
View file

@ -58,7 +58,20 @@ public class AppearanceManager {
updateMetadata(); updateMetadata();
updateTabList(gameProfile, displayName); updateTabList(gameProfile, displayName);
respawnPlayer(); respawnPlayer();
updateForOthers(); respawnEntityForOthers();
}
return result;
}
public ActionResult updateForOthers(boolean skinChange, boolean reset) {
final NickoProfile profile = getNickoProfile();
final String displayName = profile.getName() == null ? player.getName() : profile.getName();
final WrappedGameProfile gameProfile = WrappedGameProfile.fromPlayer(player).withName(displayName);
final ActionResult result = updateGameProfileSkin(gameProfile, skinChange, reset);
if (!result.isError()) {
updateMetadata();
updateTabList(gameProfile, displayName);
respawnEntityForOthers();
} }
return result; return result;
} }
@ -68,7 +81,7 @@ public class AppearanceManager {
return optionalProfile.orElse(NickoProfile.EMPTY_PROFILE.clone()); return optionalProfile.orElse(NickoProfile.EMPTY_PROFILE.clone());
} }
public void updateForOthers() { public void respawnEntityForOthers() {
final NickoProfile nickoProfile = getNickoProfile(); final NickoProfile nickoProfile = getNickoProfile();
if (!nickoProfile.hasData()) return; if (!nickoProfile.hasData()) return;

13
src/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java
View file

@ -16,6 +16,7 @@ import xyz.ineanto.nicko.storage.PlayerDataStore;
import xyz.ineanto.nicko.storage.name.PlayerNameStore; import xyz.ineanto.nicko.storage.name.PlayerNameStore;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors;
public class PlayerJoinListener implements Listener { public class PlayerJoinListener implements Listener {
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
@ -43,9 +44,15 @@ public class PlayerJoinListener implements Listener {
} }
}); });
for (Player online : Bukkit.getOnlinePlayers()) { // TODO (Ineanto, 12/6/23): Make this cleaner.
final AppearanceManager appearanceManager = new AppearanceManager(online); for (Player online : Bukkit.getOnlinePlayers().stream().filter(op -> op.getUniqueId() != player.getUniqueId()).collect(Collectors.toList())) {
appearanceManager.updateForOthers(); final Optional<NickoProfile> optionalOnlinePlayerProfile = dataStore.getData(online.getUniqueId());
optionalOnlinePlayerProfile.ifPresent(profile -> {
final AppearanceManager appearanceManager = new AppearanceManager(online);
final boolean needsASkinChange = profile.getSkin() != null && !profile.getSkin().equals(online.getName());
appearanceManager.updateForOthers(needsASkinChange, false);
});
} }
}, 20L); }, 20L);
} }