Commands name the guest who runs them, not "Player"
/give, /clear, /gamemode, /experience, /advancement, /playsound and the whisper-to-yourself lines printed the host's placeholder name for the acting player. They now use the acting player's name (a guest's own while their command runs), as target_name and the scoreboard do. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -352,12 +352,16 @@ impl Game<'_> {
|
||||
.map_or_else(String::new, |o| o.kind.clone()),
|
||||
}
|
||||
}
|
||||
/// The name of the player the game acts for: a guest's own while their
|
||||
/// command or action runs (`Player.getName`).
|
||||
pub(super) fn acting_player_name(&self) -> &str {
|
||||
self.lan_acting_name.as_deref().unwrap_or(PLAYER_NAME)
|
||||
}
|
||||
/// Entity.getDisplayName.
|
||||
pub(super) fn target_name(&self, t: Target) -> Text {
|
||||
match t {
|
||||
Target::Player => {
|
||||
// A guest's commands name the guest.
|
||||
let name = self.lan_acting_name.as_deref().unwrap_or(PLAYER_NAME);
|
||||
let name = self.acting_player_name();
|
||||
match self.score.board.players_team(name) {
|
||||
// PlayerTeam.formatNameForTeam.
|
||||
Some(team) => team.formatted_name(Text::literal(name)),
|
||||
@@ -798,7 +802,7 @@ impl Game<'_> {
|
||||
}
|
||||
self.feedback(Text::translate(
|
||||
"commands.gamemode.success.other",
|
||||
&[Text::literal(PLAYER_NAME), mode_name],
|
||||
&[Text::literal(self.acting_player_name()), mode_name],
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -953,7 +957,7 @@ impl Game<'_> {
|
||||
&[
|
||||
Text::literal(count.to_string()),
|
||||
name,
|
||||
Text::literal(PLAYER_NAME),
|
||||
Text::literal(self.acting_player_name()),
|
||||
],
|
||||
)
|
||||
} else {
|
||||
@@ -1825,7 +1829,7 @@ impl Game<'_> {
|
||||
),
|
||||
_ => None,
|
||||
};
|
||||
let player = Text::literal(PLAYER_NAME);
|
||||
let player = Text::literal(self.acting_player_name());
|
||||
let players = targets.len();
|
||||
if let (Some(i), Some(Arg::Str(criterion))) = (index, ctx.get("criterion")) {
|
||||
let a = &tree.list[i];
|
||||
@@ -1935,7 +1939,10 @@ impl Game<'_> {
|
||||
};
|
||||
self.system_message(Text::translate(
|
||||
&format!("commands.experience.query.{unit}"),
|
||||
&[Text::literal(PLAYER_NAME), Text::literal(value.to_string())],
|
||||
&[
|
||||
Text::literal(self.acting_player_name()),
|
||||
Text::literal(value.to_string()),
|
||||
],
|
||||
));
|
||||
return Ok(value);
|
||||
}
|
||||
@@ -1972,7 +1979,7 @@ impl Game<'_> {
|
||||
&key,
|
||||
&[
|
||||
Text::literal(amount.to_string()),
|
||||
Text::literal(PLAYER_NAME),
|
||||
Text::literal(self.acting_player_name()),
|
||||
],
|
||||
));
|
||||
Ok(targets.len() as i32)
|
||||
@@ -2279,7 +2286,7 @@ impl Game<'_> {
|
||||
return Err(if targets.len() == 1 {
|
||||
CommandError::new(Text::translate(
|
||||
"clear.failed.single",
|
||||
&[Text::literal(PLAYER_NAME)],
|
||||
&[Text::literal(self.acting_player_name())],
|
||||
))
|
||||
} else {
|
||||
err("clear.failed.multiple", &[&targets.len()])
|
||||
@@ -2290,7 +2297,7 @@ impl Game<'_> {
|
||||
&format!("commands.clear.{kind}.single"),
|
||||
&[
|
||||
Text::literal(removed.to_string()),
|
||||
Text::literal(PLAYER_NAME),
|
||||
Text::literal(self.acting_player_name()),
|
||||
],
|
||||
));
|
||||
Ok(removed)
|
||||
@@ -2544,7 +2551,7 @@ impl Game<'_> {
|
||||
let name = match self.command_source.map(|s| s.entity) {
|
||||
Some(Some(t)) => self.target_name(t),
|
||||
Some(None) => Text::literal("Server"),
|
||||
None => Text::literal(PLAYER_NAME),
|
||||
None => Text::literal(self.acting_player_name()),
|
||||
};
|
||||
let line = match id {
|
||||
"say" => Text::translate("chat.type.announcement", &[name, message]),
|
||||
@@ -2554,14 +2561,14 @@ impl Game<'_> {
|
||||
// Whispering to yourself: the incoming and outgoing lines.
|
||||
let out = Text::translate(
|
||||
"commands.message.display.outgoing",
|
||||
&[Text::literal(PLAYER_NAME), message.clone()],
|
||||
&[Text::literal(self.acting_player_name()), message.clone()],
|
||||
)
|
||||
.with_color(text::GRAY)
|
||||
.italic();
|
||||
self.system_message(out);
|
||||
Text::translate(
|
||||
"commands.message.display.incoming",
|
||||
&[Text::literal(PLAYER_NAME), message],
|
||||
&[Text::literal(self.acting_player_name()), message],
|
||||
)
|
||||
.with_color(text::GRAY)
|
||||
.italic()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
//! `/recipe`, `/damage`, `/rotate`, `/swing`, `/playsound`, `/stopsound`,
|
||||
//! `/particle`, `/attribute`, `/ride` and `/spreadplayers`.
|
||||
use super::{Arg, Context, Game, R, Target, err};
|
||||
use crate::game::chat::PLAYER_NAME;
|
||||
use horizon_client::{
|
||||
mobs::{Damage, DamageKind, Who},
|
||||
scoreboard_cmd::{Holder, Tracker},
|
||||
@@ -313,7 +312,7 @@ impl Game<'_> {
|
||||
(pos, volume)
|
||||
};
|
||||
self.audio.play_on(source, &sound, Some(at), v, pitch);
|
||||
tracker.mark(&holder(Text::literal(PLAYER_NAME)));
|
||||
tracker.mark(&holder(Text::literal(self.acting_player_name())));
|
||||
}
|
||||
let name = Text::literal(sound.clone());
|
||||
let (message, total) = tracker.message(
|
||||
|
||||
@@ -127,15 +127,10 @@ impl Game<'_> {
|
||||
|
||||
// ---- score holders ---------------------------------------------------
|
||||
|
||||
/// The scoreboard name of the player the game acts for: a guest's own
|
||||
/// name while their command or action runs.
|
||||
fn own_score_name(&self) -> &str {
|
||||
self.lan_acting_name.as_deref().unwrap_or(PLAYER_NAME)
|
||||
}
|
||||
/// `ScoreHolder.getScoreboardName`: the player's name, an entity's UUID.
|
||||
pub(super) fn holder_name(&mut self, t: Target) -> Option<String> {
|
||||
match t {
|
||||
Target::Player => Some(self.own_score_name().to_owned()),
|
||||
Target::Player => Some(self.acting_player_name().to_owned()),
|
||||
Target::Mob(id) | Target::Item(id) => Some(uuid_text(self.uuid_for(id))),
|
||||
_ => None,
|
||||
}
|
||||
@@ -151,7 +146,7 @@ impl Game<'_> {
|
||||
}
|
||||
/// The entity with the given scoreboard name.
|
||||
fn target_of_holder(&self, name: &str) -> Option<Target> {
|
||||
if name == self.own_score_name() {
|
||||
if name == self.acting_player_name() {
|
||||
return Some(Target::Player);
|
||||
}
|
||||
let uuid = uuid_from_text(name).filter(|_| name.len() == 36)?;
|
||||
@@ -384,7 +379,7 @@ impl Game<'_> {
|
||||
/// `ServerPlayer.die`: the death count.
|
||||
pub(super) fn score_player_died(&mut self) {
|
||||
let display = self.player_display_comp();
|
||||
let me = self.own_score_name().to_owned();
|
||||
let me = self.acting_player_name().to_owned();
|
||||
let board = &mut self.score.board;
|
||||
board.for_all_objectives_with(sb::CRITERIA_DEATH_COUNT, &me, Some(&display), |v| {
|
||||
v.wrapping_add(1)
|
||||
@@ -396,7 +391,7 @@ impl Game<'_> {
|
||||
pub(super) fn score_player_killed(&mut self, victim: Target) {
|
||||
let victim_name = self.holder_name(victim);
|
||||
let display = self.player_display_comp();
|
||||
let me = self.own_score_name().to_owned();
|
||||
let me = self.acting_player_name().to_owned();
|
||||
let board = &mut self.score.board;
|
||||
let inc = |v: i32| v.wrapping_add(1);
|
||||
board.for_all_objectives_with(sb::CRITERIA_TOTAL_KILLS, &me, Some(&display), inc);
|
||||
@@ -432,7 +427,7 @@ impl Game<'_> {
|
||||
self.score.board.players_team(&uuid_text(*uuid))
|
||||
}
|
||||
pub(super) fn player_team(&self) -> Option<&sb::Team> {
|
||||
self.score.board.players_team(self.own_score_name())
|
||||
self.score.board.players_team(self.acting_player_name())
|
||||
}
|
||||
/// The teams of the player and of the mobs on one (empty without teams).
|
||||
pub(super) fn mob_teams(&self) -> horizon_client::mobs::Teams {
|
||||
@@ -466,14 +461,14 @@ impl Game<'_> {
|
||||
}
|
||||
/// `Player.getDisplayName`: the name with the team's prefix, suffix and colour.
|
||||
pub(super) fn player_display_comp(&self) -> Comp {
|
||||
let name = literal(self.own_score_name());
|
||||
let name = literal(self.acting_player_name());
|
||||
match self.player_team() {
|
||||
Some(t) => t.formatted_name_comp(&name),
|
||||
None => name,
|
||||
}
|
||||
}
|
||||
pub(super) fn player_display_text(&self) -> Text {
|
||||
let name = Text::literal(self.own_score_name());
|
||||
let name = Text::literal(self.acting_player_name());
|
||||
match self.player_team() {
|
||||
Some(t) => t.formatted_name(name),
|
||||
None => name,
|
||||
@@ -691,7 +686,7 @@ impl Env for GameEnv<'_, '_> {
|
||||
.collect()
|
||||
}
|
||||
fn named(&mut self, name: &str) -> Holder {
|
||||
if name.eq_ignore_ascii_case(self.g.own_score_name()) && self.g.player.is_some() {
|
||||
if name.eq_ignore_ascii_case(self.g.acting_player_name()) && self.g.player.is_some() {
|
||||
return self
|
||||
.g
|
||||
.holder_for(Target::Player)
|
||||
@@ -708,7 +703,7 @@ impl Env for GameEnv<'_, '_> {
|
||||
None => Some(Target::Player),
|
||||
}?;
|
||||
let name = match entity {
|
||||
Target::Player => self.g.own_score_name().to_owned(),
|
||||
Target::Player => self.g.acting_player_name().to_owned(),
|
||||
Target::Mob(id) | Target::Item(id) => uuid_text(self.g.uuid_for(id)),
|
||||
_ => return None,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user