From 161382d06aa134d84bd77b02b7feeb6989a31df2 Mon Sep 17 00:00:00 2001
From: jshipsey <jshipsey18@gmail.com>
Date: Tue, 13 Apr 2021 03:04:48 -0400
Subject: [PATCH] changelog

---
 CHANGELOG.md                           | 2 ++
 assets/common/abilities/sword/spin.ron | 2 +-
 common/src/comp/inventory/item/mod.rs  | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe8a7ab3e3..d0d6f277dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added --sql-log-mode profile/trace parameter to veloren-server-cli
 - Added /disconnect_all_players admin command
 - Added disconnectall CLI command
+- One handed weapons can now be used and found in the world
+
 
 ### Changed
 
diff --git a/assets/common/abilities/sword/spin.ron b/assets/common/abilities/sword/spin.ron
index f5f78f15df..a0cef50ca7 100644
--- a/assets/common/abilities/sword/spin.ron
+++ b/assets/common/abilities/sword/spin.ron
@@ -7,7 +7,7 @@ SpinMelee(
     knockback: ( strength: 10.0, direction: Away),
     range: 3.5,
     damage_effect: None,
-    energy_cost: 0,
+    energy_cost: 150,
     is_infinite: false,
     movement_behavior: ForwardGround,
     is_interruptible: true,
diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs
index 27d2995432..117e6a43bc 100644
--- a/common/src/comp/inventory/item/mod.rs
+++ b/common/src/comp/inventory/item/mod.rs
@@ -265,11 +265,9 @@ impl TryFrom<(&ItemKind, &[Item], &AbilityMap, &MaterialStatManifest)> for ItemC
             Ok(ItemConfig {
                 abilities,
                 block_ability: None,
-                dodge_ability: Some(CharacterAbility::default_roll()),
             })
         } else {
             Err(ItemConfigError::BadItemKind)
-            };
         }
     }
 }