CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update player dest display if setting changes

Browse Source 
Also fixed issue where registered listeners would be called before new value is set
This commit is contained in:
Husky
2026-04-02 21:16:05 -04:00
parent 4c87f8de37
commit 3bdfde4ed2
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/players/settings/PlayerSetting.java
View File

@@ -201,13 +201,14 @@ public abstract class PlayerSetting<T> {
* @param value New value
*/
public void setValue(UUID player, T value) {
T oldValue = getValue(player);
values.put(player, value);
if (listeners != null) {
T oldValue = getValue(player);
for (SettingChangeListener<T> listener : listeners) {
listener.handle(player, this, oldValue, value);
}
}
values.put(player, value);
}
/**

27
plugins/railswitch-paper/src/main/java/sh/okx/railswitch/settings/SettingsManager.java
View File

@@ -11,7 +11,9 @@ import vg.civcraft.mc.civmodcore.players.scoreboard.bottom.BottomLine;
import vg.civcraft.mc.civmodcore.players.scoreboard.bottom.BottomLineAPI;
import vg.civcraft.mc.civmodcore.players.scoreboard.side.CivScoreBoard;
import vg.civcraft.mc.civmodcore.players.scoreboard.side.ScoreBoardAPI;
import vg.civcraft.mc.civmodcore.players.settings.PlayerSetting;
import vg.civcraft.mc.civmodcore.players.settings.impl.DisplayLocationSetting;
import java.util.UUID;
/**
* Manages the initialisation and registration of menu settings.
@@ -39,7 +41,7 @@ public final class SettingsManager {
destSetting = new DestinationSetting(plugin);
resetSetting = new ResetSetting(plugin, destSetting);
destDisplayLocation = new DisplayLocationSetting(plugin, DisplayLocationSetting.DisplayLocation.SIDEBAR,
"Dest Display Location", "destDisplayLocation", new ItemStack(Material.ARROW), "the destination");
"Dest Display Location", "destDisplayLocation", new ItemStack(Material.ARROW), "destination");
// Register those elements
menu.registerToParentMenu();
menu.registerSetting(destSetting);
@@ -48,6 +50,14 @@ public final class SettingsManager {
destScoreBoard = ScoreBoardAPI.createBoard("RailSwitchDestDisplay");
destBottomLine = BottomLineAPI.createBottomLine("RailSwitchDestDisplay", 4);
// update player ui if scoreboard display location setting is changed
destDisplayLocation.registerListener((UUID uuid, PlayerSetting<String> setting, String oldValue, String newValue) -> {
Player player = plugin.getServer().getPlayer(uuid);
if (player != null) {
updateDestScoreboardHud(player);
}
});
}
/**
@@ -83,7 +93,6 @@ public final class SettingsManager {
player.sendMessage(ChatColor.RED + "Could not set your destination.");
}
}
// updateDestScoreboardHud(player);
}
/**
@@ -104,19 +113,21 @@ public final class SettingsManager {
String dest = getDestination(p);
if (Strings.isNullOrEmpty(dest)) {
// remove if dest is empty
if (destDisplayLocation.showOnSidebar(p.getUniqueId())) {
destScoreBoard.hide(p);
}
if (destDisplayLocation.showOnActionbar(p.getUniqueId())) {
destBottomLine.removePlayer(p);
}
destScoreBoard.hide(p);
destBottomLine.removePlayer(p);
} else {
// set dest on hud
if (destDisplayLocation.showOnSidebar(p.getUniqueId())) {
destScoreBoard.set(p, ChatColor.GOLD + "Dest: " + ChatColor.AQUA + dest);
} else {
// remove if disabled as the dest might still be showing on the sidebar from before
destScoreBoard.hide(p);
}
if (destDisplayLocation.showOnActionbar(p.getUniqueId())) {
destBottomLine.updatePlayer(p, ChatColor.GOLD + "Dest: " + ChatColor.AQUA + dest);
} else {
// remove if disabled as the dest might still be showing on the actionbar from before
destBottomLine.removePlayer(p);
}
}
}