Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename /be_npc to /into_npc

Browse Source
This commit is contained in:
juliancoffee 2024-02-02 14:16:25 +02:00
parent 70b5c2927d
commit 7e2f219de1
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/cmd.rs
View File

@ -317,7 +317,6 @@ pub enum ServerChatCommand {
Ban, Ban,
BattleMode, BattleMode,
BattleModeForce, BattleModeForce,
BeNpc,
Body, Body,
Buff, Buff,
Build, Build,
@ -342,6 +341,7 @@ pub enum ServerChatCommand {
GroupPromote, GroupPromote,
Health, Health,
Help, Help,
IntoNpc,
JoinFaction, JoinFaction,
Jump, Jump,
Kick, Kick,
@ -486,7 +486,7 @@ impl ServerChatCommand {
None, None,
), ),
ServerChatCommand::BeNpc => cmd( ServerChatCommand::IntoNpc => cmd(
vec![ vec![
AssetPath( AssetPath(
"entity_config", "entity_config",
@ -977,16 +977,15 @@ impl ServerChatCommand {
ServerChatCommand::Airship => "airship", ServerChatCommand::Airship => "airship",
ServerChatCommand::Alias => "alias", ServerChatCommand::Alias => "alias",
ServerChatCommand::Alignment => "alignment", ServerChatCommand::Alignment => "alignment",
ServerChatCommand::Ban => "ban",
ServerChatCommand::BattleMode => "battlemode",
ServerChatCommand::BattleModeForce => "battlemode_force",
ServerChatCommand::BeNpc => "be_npc",
ServerChatCommand::Body => "body",
ServerChatCommand::Buff => "buff",
ServerChatCommand::Build => "build",
ServerChatCommand::AreaAdd => "area_add", ServerChatCommand::AreaAdd => "area_add",
ServerChatCommand::AreaList => "area_list", ServerChatCommand::AreaList => "area_list",
ServerChatCommand::AreaRemove => "area_remove", ServerChatCommand::AreaRemove => "area_remove",
ServerChatCommand::Ban => "ban",
ServerChatCommand::BattleMode => "battlemode",
ServerChatCommand::BattleModeForce => "battlemode_force",
ServerChatCommand::Body => "body",
ServerChatCommand::Buff => "buff",
ServerChatCommand::Build => "build",
ServerChatCommand::Campfire => "campfire", ServerChatCommand::Campfire => "campfire",
ServerChatCommand::DebugColumn => "debug_column", ServerChatCommand::DebugColumn => "debug_column",
ServerChatCommand::DebugWays => "debug_ways", ServerChatCommand::DebugWays => "debug_ways",
@ -1000,11 +999,11 @@ impl ServerChatCommand {
ServerChatCommand::Group => "group", ServerChatCommand::Group => "group",
ServerChatCommand::GroupInvite => "group_invite", ServerChatCommand::GroupInvite => "group_invite",
ServerChatCommand::GroupKick => "group_kick", ServerChatCommand::GroupKick => "group_kick",
ServerChatCommand::GroupPromote => "group_promote",
ServerChatCommand::GroupLeave => "group_leave", ServerChatCommand::GroupLeave => "group_leave",
ServerChatCommand::GroupPromote => "group_promote",
ServerChatCommand::Health => "health", ServerChatCommand::Health => "health",
ServerChatCommand::Help => "help", ServerChatCommand::Help => "help",
ServerChatCommand::Respawn => "respawn", ServerChatCommand::IntoNpc => "into_npc",
ServerChatCommand::JoinFaction => "join_faction", ServerChatCommand::JoinFaction => "join_faction",
ServerChatCommand::Jump => "jump", ServerChatCommand::Jump => "jump",
ServerChatCommand::Kick => "kick", ServerChatCommand::Kick => "kick",
@ -1012,6 +1011,7 @@ impl ServerChatCommand {
ServerChatCommand::KillNpcs => "kill_npcs", ServerChatCommand::KillNpcs => "kill_npcs",
ServerChatCommand::Kit => "kit", ServerChatCommand::Kit => "kit",
ServerChatCommand::Lantern => "lantern", ServerChatCommand::Lantern => "lantern",
ServerChatCommand::Respawn => "respawn",
ServerChatCommand::Light => "light", ServerChatCommand::Light => "light",
ServerChatCommand::MakeBlock => "make_block", ServerChatCommand::MakeBlock => "make_block",
ServerChatCommand::MakeNpc => "make_npc", ServerChatCommand::MakeNpc => "make_npc",

18
server/src/cmd.rs
View File

@ -128,16 +128,15 @@ fn do_command(
ServerChatCommand::Airship => handle_spawn_airship, ServerChatCommand::Airship => handle_spawn_airship,
ServerChatCommand::Alias => handle_alias, ServerChatCommand::Alias => handle_alias,
ServerChatCommand::Alignment => handle_alignment, ServerChatCommand::Alignment => handle_alignment,
ServerChatCommand::Ban => handle_ban,
ServerChatCommand::BattleMode => handle_battlemode,
ServerChatCommand::BattleModeForce => handle_battlemode_force,
ServerChatCommand::BeNpc => handle_be_npc,
ServerChatCommand::Body => handle_body,
ServerChatCommand::Buff => handle_buff,
ServerChatCommand::Build => handle_build,
ServerChatCommand::AreaAdd => handle_area_add, ServerChatCommand::AreaAdd => handle_area_add,
ServerChatCommand::AreaList => handle_area_list, ServerChatCommand::AreaList => handle_area_list,
ServerChatCommand::AreaRemove => handle_area_remove, ServerChatCommand::AreaRemove => handle_area_remove,
ServerChatCommand::Ban => handle_ban,
ServerChatCommand::BattleMode => handle_battlemode,
ServerChatCommand::BattleModeForce => handle_battlemode_force,
ServerChatCommand::Body => handle_body,
ServerChatCommand::Buff => handle_buff,
ServerChatCommand::Build => handle_build,
ServerChatCommand::Campfire => handle_spawn_campfire, ServerChatCommand::Campfire => handle_spawn_campfire,
ServerChatCommand::DebugColumn => handle_debug_column, ServerChatCommand::DebugColumn => handle_debug_column,
ServerChatCommand::DebugWays => handle_debug_ways, ServerChatCommand::DebugWays => handle_debug_ways,
@ -155,7 +154,7 @@ fn do_command(
ServerChatCommand::GroupPromote => handle_group_promote, ServerChatCommand::GroupPromote => handle_group_promote,
ServerChatCommand::Health => handle_health, ServerChatCommand::Health => handle_health,
ServerChatCommand::Help => handle_help, ServerChatCommand::Help => handle_help,
ServerChatCommand::Respawn => handle_respawn, ServerChatCommand::IntoNpc => handle_into_npc,
ServerChatCommand::JoinFaction => handle_join_faction, ServerChatCommand::JoinFaction => handle_join_faction,
ServerChatCommand::Jump => handle_jump, ServerChatCommand::Jump => handle_jump,
ServerChatCommand::Kick => handle_kick, ServerChatCommand::Kick => handle_kick,
@ -175,6 +174,7 @@ fn do_command(
ServerChatCommand::Region => handle_region, ServerChatCommand::Region => handle_region,
ServerChatCommand::ReloadChunks => handle_reload_chunks, ServerChatCommand::ReloadChunks => handle_reload_chunks,
ServerChatCommand::RemoveLights => handle_remove_lights, ServerChatCommand::RemoveLights => handle_remove_lights,
ServerChatCommand::Respawn => handle_respawn,
ServerChatCommand::RevokeBuild => handle_revoke_build, ServerChatCommand::RevokeBuild => handle_revoke_build,
ServerChatCommand::RevokeBuildAll => handle_revoke_build_all, ServerChatCommand::RevokeBuildAll => handle_revoke_build_all,
ServerChatCommand::Safezone => handle_safezone, ServerChatCommand::Safezone => handle_safezone,
@ -669,7 +669,7 @@ fn handle_alignment(
Ok(()) Ok(())
} }
fn handle_be_npc( fn handle_into_npc(
server: &mut Server, server: &mut Server,
client: EcsEntity, client: EcsEntity,
target: EcsEntity, target: EcsEntity,