From 4117f2f2a8b5e3aa4361552678dfcf6fed75234f Mon Sep 17 00:00:00 2001
From: CapsizeGlimmer <>
Date: Sat, 6 Jun 2020 03:32:09 -0400
Subject: [PATCH] cargo fmt; changelog

---
 CHANGELOG.md          | 6 +++++-
 client/src/lib.rs     | 3 ++-
 server/src/cmd.rs     | 6 +++++-
 server/src/sys/mod.rs | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 913e98d1c8..5f2c5aa6e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Eyebrows and shapes can now be selected
 - Character name and level information to chat, social tab and `/players` command
 - Added inventory, armour and weapon saving
-- Show where screenshots are saved to in the chat
+- Show where screenshots are saved in the chat
 - Added basic auto walk
 - Added weapon/attack sound effects
 - M2 attack for bow
@@ -26,6 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Server whitelist
 - Optional server-side maximum view distance
 - MOTD on login
+- Added group chat `/join_group` `/group`
+- Added faction chat `/join_faction` `/faction`
+- Added regional, local, and global chat (`/region`, `/say`, and `/world`, respectively)
+- Added command shortcuts for each of the above chat modes (`/g`, `/f`, `/r`, `/s`, and `/w`, respectively and `/t` for `/tell`)
 
 ### Changed
 
diff --git a/client/src/lib.rs b/client/src/lib.rs
index 00fa050aa2..5f0145634e 100644
--- a/client/src/lib.rs
+++ b/client/src/lib.rs
@@ -764,7 +764,8 @@ impl Client {
                             player_info.is_admin = admin;
                         } else {
                             warn!(
-                                "Received msg to update admin status of uid {}, but they were not in the list.",
+                                "Received msg to update admin status of uid {}, but they were not \
+                                 in the list.",
                                 uid
                             );
                         }
diff --git a/server/src/cmd.rs b/server/src/cmd.rs
index 2370832476..46219c0fe2 100644
--- a/server/src/cmd.rs
+++ b/server/src/cmd.rs
@@ -959,7 +959,11 @@ fn handle_adminify(
             .map(|(entity, _)| entity);
         match opt_player {
             Some(player) => {
-                let is_admin = if server.state.read_component_cloned::<comp::Admin>(player).is_some() {
+                let is_admin = if server
+                    .state
+                    .read_component_cloned::<comp::Admin>(player)
+                    .is_some()
+                {
                     ecs.write_storage::<comp::Admin>().remove(player);
                     false
                 } else {
diff --git a/server/src/sys/mod.rs b/server/src/sys/mod.rs
index c89b36bf41..38aa19d4f5 100644
--- a/server/src/sys/mod.rs
+++ b/server/src/sys/mod.rs
@@ -40,7 +40,8 @@ pub fn add_server_systems(dispatch_builder: &mut DispatcherBuilder) {
     dispatch_builder.add(terrain::Sys, TERRAIN_SYS, &[]);
     dispatch_builder.add(waypoint::Sys, WAYPOINT_SYS, &[]);
     dispatch_builder.add(persistence::Sys, PERSISTENCE_SYS, &[]);
-    //dispatch_builder.add(persistence::stats::Sys, STATS_PERSISTENCE_SYS, &[]);
+    //dispatch_builder.add(persistence::stats::Sys, STATS_PERSISTENCE_SYS,
+    // &[]);
 }
 
 pub fn run_sync_systems(ecs: &mut specs::World) {