From 229e7b9ceca24b76235c1ed98ff99d13e972e8d4 Mon Sep 17 00:00:00 2001
From: juliancoffee <lightdarkdaughter@gmail.com>
Date: Wed, 28 Jul 2021 14:36:36 +0300
Subject: [PATCH] Add CHANGELOG note about battle_mode setting

---
 CHANGELOG.md            | 1 +
 common/src/resources.rs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9712d6266d..0f39c3f7e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Healing sceptre crafting recipe
 - NPCs can now warn players before engaging in combat
 - Custom error message when a supported graphics backend can not be found
+- Add server setting with PvE/PvP switch
 
 ### Changed
 
diff --git a/common/src/resources.rs b/common/src/resources.rs
index ee57b3242a..2b08b6407b 100644
--- a/common/src/resources.rs
+++ b/common/src/resources.rs
@@ -77,7 +77,7 @@ pub struct PlayerPhysicsSettings {
 
 /// Describe how players interact with other players.
 ///
-/// Probably will be removed when we will discover better way
+/// May be removed when we will discover better way
 /// to handle duels and murders
 #[derive(Copy, Clone, Debug, Deserialize, Serialize)]
 pub enum BattleMode {