Skip to content

Port from v3 to v4: 2025-04-05 #500

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

Merged
merged 1 commit into from
Apr 4, 2025
Merged

Port from v3 to v4: 2025-04-05 #500

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...ngeecord/src/main/java/com/rexcantor64/triton/bungeecord/player/BungeeLanguagePlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@ public void setLang(Language language, boolean sendToSpigot) {
PlayerChangeLanguageBungeeEvent event = new PlayerChangeLanguageBungeeEvent(this, this.language, language);
BungeeCord.getInstance().getPluginManager().callEvent(event);
if (event.isCancelled()) return;
this.language = event.getNewLanguage();
if (this.waitingForClientLocale && getParent() != null)
parent.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&', Triton.get().getMessagesConfig()
.getMessage("success.detected-language", language.getDisplayName()))));
this.language = event.getNewLanguage();
this.waitingForClientLocale = false;

if (sendToSpigot && getParent() != null)
Expand Down
4 changes: 2 additions & 2 deletions triton-spigot/src/main/java/com/rexcantor64/triton/spigot/player/SpigotLanguagePlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ public void setLang(Language lang, boolean sendToBungee) {
PlayerChangeLanguageSpigotEvent event = new PlayerChangeLanguageSpigotEvent(this, this.lang, lang);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) return;
boolean hasChanged = !Objects.equals(event.getNewLanguage(), this.lang);
this.lang = event.getNewLanguage();
if (this.waitingForClientLocale) {
try {
if (toBukkit().isPresent()) {
Expand All @@ -143,8 +145,6 @@ public void setLang(Language lang, boolean sendToBungee) {
Triton.get().getLogger().logError(e, "Failed to send \"language changed\" message.");
}
}
boolean hasChanged = !Objects.equals(event.getNewLanguage(), this.lang);
this.lang = event.getNewLanguage();
this.waitingForClientLocale = false;
if (hasChanged) {
refreshAll();
Expand Down
3 changes: 2 additions & 1 deletion ...velocity/src/main/java/com/rexcantor64/triton/velocity/player/VelocityLanguagePlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,14 @@ public void setLang(Language language) {
public void setLang(Language language, boolean sendToSpigot) {
// TODO fire Triton's API change language event
val player = getPlatformPlayer();

this.language = language;
if (this.waitingForClientLocale) {
player.ifPresent(parent -> parent.sendMessage(
LegacyComponentSerializer.legacyAmpersand().deserialize(Triton.get().getMessagesConfig()
.getMessage("success.detected-language", language.getDisplayName()))));

}
this.language = language;
this.waitingForClientLocale = false;

if (sendToSpigot) {
Expand Down
Loading