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

Give singleplayer its own server settings

Browse Source
This commit is contained in:
Piotr Korgól
2019-08-14 17:51:59 +02:00
parent 8ec0a06bbe
commit 0221de484e
7 changed files with 103 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/src/lib.rs
View File

@ -204,7 +204,7 @@ impl Server {
// Make sure physics are accepted.
state.write_component(entity, comp::ForceUpdate);
// Give the AdminPerms component to the player if their name exists in admin list
// Give the Admin component to the player if their name exists in admin list
if server_settings.admins.contains(
&state
.ecs()
@ -213,7 +213,7 @@ impl Server {
.unwrap()
.alias,
) {
state.write_component(entity, comp::AdminPerms);
state.write_component(entity, comp::Admin);
}
// Tell the client its request was successful.
client.allow_state(ClientState::Character);
@ -822,17 +822,13 @@ impl Server {
} else {
let message =
match self.state.ecs().read_storage::<comp::Player>().get(entity) {
Some(player) => match self
.state
.ecs()
.read_storage::<comp::AdminPerms>()
.get(entity)
{
Some(_perms) => {
Some(player) => {
if self.entity_is_admin(entity) {
format!("[ADMIN][{}] {}", &player.alias, message)
} else {
format!("[{}] {}", &player.alias, message)
}
None => format!("[{}] {}", &player.alias, message),
},
}
None => format!("[<Unknown>] {}", message),
};
self.clients
@ -1182,6 +1178,13 @@ impl Server {
}
}
}
fn entity_is_admin(&self, entity: EcsEntity) -> bool {
self.state
.read_storage::<comp::Admin>()
.get(entity)
.is_some()
}
}
impl Drop for Server {