From e04fdd715e8cca405930060eb50dbf334e4ebe3d Mon Sep 17 00:00:00 2001
From: AdamWhitehurst <Adam.Whitehurst@live.com>
Date: Wed, 1 Apr 2020 07:07:10 -0700
Subject: [PATCH] expose and use blocking consts

---
 common/src/sys/combat.rs                 | 4 ++--
 common/src/sys/mod.rs                    | 2 +-
 server/src/events/entity_manipulation.rs | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/src/sys/combat.rs b/common/src/sys/combat.rs
index 5d7bbc69c0..02cc2f5c0a 100644
--- a/common/src/sys/combat.rs
+++ b/common/src/sys/combat.rs
@@ -9,8 +9,8 @@ use crate::{
 use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
 use vek::*;
 
-const BLOCK_EFFICIENCY: f32 = 0.9;
-const BLOCK_ANGLE: f32 = 180.0;
+pub const BLOCK_EFFICIENCY: f32 = 0.9;
+pub const BLOCK_ANGLE: f32 = 180.0;
 
 /// This system is responsible for handling accepted inputs like moving or
 /// attacking
diff --git a/common/src/sys/mod.rs b/common/src/sys/mod.rs
index 1e478ea87c..832dc37d63 100644
--- a/common/src/sys/mod.rs
+++ b/common/src/sys/mod.rs
@@ -1,6 +1,6 @@
 pub mod agent;
 pub mod character_behavior;
-mod combat;
+pub mod combat;
 pub mod controller;
 mod mount;
 pub mod phys;
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index 17231b07f1..59eb020f02 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -5,6 +5,7 @@ use common::{
     msg::ServerMsg,
     state::BlockChange,
     sync::{Uid, WorldSyncExt},
+    sys::combat::{BLOCK_ANGLE, BLOCK_EFFICIENCY},
     terrain::{Block, TerrainGrid},
     vol::{ReadVol, Vox},
 };
@@ -12,9 +13,6 @@ use log::error;
 use specs::{join::Join, Entity as EcsEntity, WorldExt};
 use vek::Vec3;
 
-const BLOCK_EFFICIENCY: f32 = 0.9;
-const BLOCK_ANGLE: f32 = 180.0;
-
 pub fn handle_damage(server: &Server, uid: Uid, change: HealthChange) {
     let state = &server.state;
     let ecs = state.ecs();