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

Fix spawn command, properly search for admins

Browse Source
This commit is contained in:
Piotr Korgól 2019-08-12 18:11:06 +02:00
parent 6882170d6f
commit 8ec0a06bbe
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/src/npc.rs
View File

@ -36,8 +36,7 @@ impl FromStr for NpcKind {
} }
lazy_static! { lazy_static! {
static ref NPC_NAMES_JSON: Arc<serde_json::Value> = static ref NPC_NAMES_JSON: Arc<serde_json::Value> = assets::load_expect("common.npc_names");
assets::load_expect("common/npc_names.json");
} }
pub fn get_npc_name(npc_type: NpcKind) -> String { pub fn get_npc_name(npc_type: NpcKind) -> String {

29
server/src/lib.rs
View File

@ -193,7 +193,7 @@ impl Server {
let spawn_point = state.ecs().read_resource::<SpawnPoint>().0; let spawn_point = state.ecs().read_resource::<SpawnPoint>().0;
state.write_component(entity, body); state.write_component(entity, body);
state.write_component(entity, comp::Stats::new(name.to_string())); state.write_component(entity, comp::Stats::new(name));
state.write_component(entity, comp::Controller::default()); state.write_component(entity, comp::Controller::default());
state.write_component(entity, comp::Pos(spawn_point)); state.write_component(entity, comp::Pos(spawn_point));
state.write_component(entity, comp::Vel(Vec3::zero())); state.write_component(entity, comp::Vel(Vec3::zero()));
@ -204,15 +204,16 @@ impl Server {
// Make sure physics are accepted. // Make sure physics are accepted.
state.write_component(entity, comp::ForceUpdate); state.write_component(entity, comp::ForceUpdate);
let settings = server_settings.clone();
// Give the AdminPerms component to the player if their name exists in admin list // Give the AdminPerms component to the player if their name exists in admin list
if settings.admins.contains(&name) { if server_settings.admins.contains(
&state
.ecs()
.read_storage::<comp::Player>()
.get(entity)
.unwrap()
.alias,
) {
state.write_component(entity, comp::AdminPerms); state.write_component(entity, comp::AdminPerms);
dbg!("Given admin perms to an user");
dbg!(settings.admins);
} else {
dbg!(settings.admins);
dbg!("The new user isn't an admin");
} }
// Tell the client its request was successful. // Tell the client its request was successful.
client.allow_state(ClientState::Character); client.allow_state(ClientState::Character);
@ -821,7 +822,17 @@ impl Server {
} else { } else {
let message = let message =
match self.state.ecs().read_storage::<comp::Player>().get(entity) { match self.state.ecs().read_storage::<comp::Player>().get(entity) {
Some(player) => format!("[{}] {}", &player.alias, message), Some(player) => match self
.state
.ecs()
.read_storage::<comp::AdminPerms>()
.get(entity)
{
Some(_perms) => {
format!("[ADMIN][{}] {}", &player.alias, message)
}
None => format!("[{}] {}", &player.alias, message),
},
None => format!("[<Unknown>] {}", message), None => format!("[<Unknown>] {}", message),
}; };
self.clients self.clients