diff --git a/chatcommands.lua b/chatcommands.lua
new file mode 100644
index 0000000..e1cf451
--- /dev/null
+++ b/chatcommands.lua
@@ -0,0 +1,63 @@
+local player_persistent_data = pvp_revamped.player_persistent_data
+local projectile_throw_style_dip = pvp_revamped.projectile_throw_style_dip
+local projectile_throw_style_spinning = pvp_revamped.projectile_throw_style_spinning
+
+-- Cmd for changing the way you throw items.
+minetest.register_chatcommand("throw_style", {
+    params = "[<style>]: Change how you throw an item.",
+    description = "Change how you throw an item. Accepted values are [none|spin|dip]",
+    privs = {
+        interact = true,
+    },
+    func = function(name, param)
+        -- Check the given param.
+        if param == "none" then
+            -- Set the style to none.
+            player_persistent_data[name].throw_style = nil
+            
+            return true, "Throw style set to none."
+        elseif param == "spin" then
+            -- Give the item a little spin.
+            player_persistent_data[name].throw_style = projectile_throw_style_spinning
+
+            return true, "Throw style set to spin."
+        elseif param == "dip" then
+            -- Bullet drop.
+            player_persistent_data[name].throw_style = projectile_throw_style_dip
+
+            return true, "Throw style set to dip."
+        end
+
+        -- throw_style cmd help.
+        return false, "Only parameters: 'none', 'spin', and 'dip' are accepted."
+    end
+})
+
+-- See if the mod armor_3d is a thing here.
+if minetest.global_exists("armor") then
+    -- Cmd for changing the way you block incoming damage.
+    minetest.register_chatcommand("use_shield", {
+        params = "[<boolean>]: Change how you block incoming damage.",
+        description = "If set to true, the shield plate placed in the armor inventory will be used to block all incoming damage when block key is pressed.",
+        privs = {
+            interact = true,
+        },
+        func = function(name, param)
+            -- Check the given param.
+            if param == "true" then
+                -- block key will now use the shield in the armor inv to block any incoming damage.
+                player_persistent_data[name].use_shield = true
+                
+                return true, "Shield from armor inventory will now be used to block damage."
+            elseif param == "false" then
+                -- block key will now use whatever tool selected to block any incoming damage.
+                player_persistent_data[name].use_shield = nil
+
+                return true, "Tools will now be used to block damage."
+            end
+
+            -- use_shield cmd help.
+            return false, "Only parameters: 'true', and 'false' are accepted."
+        end
+    })
+end
diff --git a/config.lua b/config.lua
new file mode 100644
index 0000000..0433e77
--- /dev/null
+++ b/config.lua
@@ -0,0 +1,67 @@
+pvp_revamped.config = {}
+pvp_revamped.config.head_height = tonumber(minetest.settings:get("pvp_revamped.head_height")) or 1.35
+pvp_revamped.config.torso_height = tonumber(minetest.settings:get("pvp_revamped.torso_height")) or 0.75
+pvp_revamped.config.leg_height = tonumber(minetest.settings:get("pvp_revamped.leg_height")) or 0.45
+pvp_revamped.config.knee_height = tonumber(minetest.settings:get("pvp_revamped.knee_height")) or 0.375
+pvp_revamped.config.block_duration = tonumber(minetest.settings:get("pvp_revamped.block_duration")) or 100000
+pvp_revamped.config.dodge_duration = tonumber(minetest.settings:get("pvp_revamped.dodge_duration"))  or 350000
+pvp_revamped.config.barrel_roll_duration = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_duration"))  or 500000
+pvp_revamped.config.dodge_cooldown = tonumber(minetest.settings:get("pvp_revamped.dodge_cooldown"))  or 1500000
+pvp_revamped.config.barrel_roll_cooldown = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_cooldown"))  or 5000000
+pvp_revamped.config.dash_cooldown = tonumber(minetest.settings:get("pvp_revamped.dash_cooldown"))  or 2000000
+pvp_revamped.config.dodge_aerial_cooldown = tonumber(minetest.settings:get("pvp_revamped.dodge_aerial_cooldown"))  or 5000000
+pvp_revamped.config.barrel_roll_aerial_cooldown = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_aerial_cooldown"))  or 10000000
+pvp_revamped.config.dash_aerial_cooldown = tonumber(minetest.settings:get("pvp_revamped.dash_aerial_cooldown"))  or 4000000
+pvp_revamped.config.dash_speed = tonumber(minetest.settings:get("pvp_revamped.dash_speed")) or 9.2
+pvp_revamped.config.barrel_roll_speed = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_speed")) or 1
+pvp_revamped.config.disarm_chance_mul = tonumber(minetest.settings:get("pvp_revamped.disarm_chance_mul")) or 2
+pvp_revamped.config.leg_stagger_mul = tonumber(minetest.settings:get("pvp_revamped.leg_stagger_mul")) or 0.8
+pvp_revamped.config.knee_stagger_mul = tonumber(minetest.settings:get("pvp_revamped.knee_stagger_mul")) or 1.5
+pvp_revamped.config.stagger_mul = tonumber(minetest.settings:get("pvp_revamped.stagger_mul")) or 100000
+pvp_revamped.config.block_duration_mul = tonumber(minetest.settings:get("pvp_revamped.block_duration_mul")) or 100000
+pvp_revamped.config.block_interval_mul = tonumber(minetest.settings:get("pvp_revamped.block_interval_mul")) or 0.15
+pvp_revamped.config.block_pool_mul = tonumber(minetest.settings:get("pvp_revamped.block_pool_mul")) or 2
+pvp_revamped.config.shield_duration = tonumber(minetest.settings:get("pvp_revamped.shield_duration")) or 100000
+pvp_revamped.config.shield_duration_mul = tonumber(minetest.settings:get("pvp_revamped.shield_duration_mul")) or 100000
+pvp_revamped.config.shield_pool_mul = tonumber(minetest.settings:get("pvp_revamped.shield_pool_mul")) or 4
+pvp_revamped.config.block_wear_mul = tonumber(minetest.settings:get("pvp_revamped.block_wear_mul")) or 9000
+pvp_revamped.config.shield_axe_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.shield_axe_dmg_mul")) or 20
+pvp_revamped.config.head_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.head_dmg_mul")) or 1.2
+pvp_revamped.config.torso_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.torso_dmg_mul")) or 1.0
+pvp_revamped.config.arm_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.arm_dmg_mul")) or 0.6
+pvp_revamped.config.leg_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.leg_dmg_mul")) or 0.7
+pvp_revamped.config.front_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.front_dmg_mul")) or nil
+pvp_revamped.config.side_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.side_dmg_mul")) or 1.05
+pvp_revamped.config.back_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.back_dmg_mul")) or 1.1
+pvp_revamped.config.elevated_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.elevated_dmg_mul")) or 1.5
+pvp_revamped.config.equal_height_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.equal_height_dmg_mul")) or nil
+pvp_revamped.config.lower_elevation_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.lower_elevation_dmg_mul")) or 0.9
+pvp_revamped.config.velocity_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.velocity_dmg_mul")) or 0.15
+pvp_revamped.config.optimal_distance_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.optimal_distance_dmg_mul")) or 0.2
+pvp_revamped.config.maximum_distance_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.maximum_distance_dmg_mul")) or 0.1
+pvp_revamped.config.optimal_distance_mul = tonumber(minetest.settings:get("pvp_revamped.optimal_distance_mul")) or 0.625
+pvp_revamped.config.projectile_full_throw_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_full_throw_mul")) or 2
+pvp_revamped.config.projectile_half_throw_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_half_throw_mul")) or 0.000005
+pvp_revamped.config.projectile_speed_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_speed_mul")) or 3
+pvp_revamped.config.projectile_gravity = tonumber(minetest.settings:get("pvp_revamped.projectile_gravity")) or -10
+pvp_revamped.config.projectile_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_dmg_mul")) or 0.5
+pvp_revamped.config.projectile_velocity_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_velocity_dmg_mul")) or 0.01
+pvp_revamped.config.projectile_step = tonumber(minetest.settings:get("pvp_revamped.projectile_step")) or 0.15
+pvp_revamped.config.projectile_dist = tonumber(minetest.settings:get("pvp_revamped.projectile_dist")) or 5
+pvp_revamped.config.projectile_spinning_gravity_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_spinning_gravity_mul")) or 0.5
+pvp_revamped.config.projectile_dip_gravity_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_dip_gravity_mul")) or 1.2
+
+local xyz = minetest.settings:get("pvp_revamped.projectile_dip_velocity_dmg_mul") or {1, 2, 1}
+
+if xyz and type(xyz) == "string" then
+    xyz = minetest.settings:get("pvp_revamped.projectile_dip_velocity_dmg_mul"):split(" ")
+end
+
+pvp_revamped.config.projectile_dip_velocity_dmg_mul = {x = tonumber(xyz[1]), y = tonumber(xyz[2]), z = tonumber(xyz[3])}
+pvp_revamped.config.parry_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.parry_dmg_mul")) or 1.2
+pvp_revamped.config.counter_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.counter_dmg_mul")) or 1.5
+pvp_revamped.config.clash_duration = tonumber(minetest.settings:get("pvp_revamped.clash_duration")) or 150000
+pvp_revamped.config.counter_duration = tonumber(minetest.settings:get("pvp_revamped.counter_duration")) or 100000
+pvp_revamped.config.hasty_guard_duration = tonumber(minetest.settings:get("pvp_revamped.hasty_guard_duration")) or 50000
+pvp_revamped.config.hasty_guard_mul = tonumber(minetest.settings:get("pvp_revamped.hasty_guard_mul")) or 1000
+pvp_revamped.config.hasty_shield_mul = tonumber(minetest.settings:get("pvp_revamped.hasty_shield_mul")) or 1000
diff --git a/constant.lua b/constant.lua
new file mode 100644
index 0000000..9d2cc83
--- /dev/null
+++ b/constant.lua
@@ -0,0 +1,2 @@
+pvp_revamped.projectile_throw_style_dip = 1
+pvp_revamped.projectile_throw_style_spinning = 2
diff --git a/entites.lua b/entites.lua
new file mode 100644
index 0000000..2126e61
--- /dev/null
+++ b/entites.lua
@@ -0,0 +1,267 @@
+local projectile_dmg_mul = pvp_revamped.config.projectile_dmg_mul
+local projectile_velocity_dmg_mul = pvp_revamped.config.projectile_velocity_dmg_mul
+local projectile_step = pvp_revamped.config.projectile_step
+local projectile_dist = pvp_revamped.config.projectile_dist
+local projectile_dip_velocity_dmg_mul = pvp_revamped.config.projectile_dip_velocity_dmg_mul
+local projectile_throw_style_dip = pvp_revamped.projectile_throw_style_dip
+local projectile_throw_style_spinning = pvp_revamped.projectile_throw_style_spinning
+local projectile_data = pvp_revamped.projectile_data
+local registered_tools = minetest.registered_tools
+local serialize = minetest.serialize
+local deserialize = minetest.deserialize
+local raycast = minetest.raycast
+local get_player_by_name = minetest.get_player_by_name
+local add_item = minetest.add_item
+local add = vector.add
+local multiply = vector.multiply
+local distance = vector.distance
+local normalize = vector.normalize
+local asin = math.asin
+local abs = math.abs
+local max = math.max
+local min = math.min
+local pi = math.pi
+local rad45 = pi * 0.25
+local rad90 = pi * 0.5
+
+-- Entity for thrown items.
+minetest.register_entity("pvp_revamped:projectile", {
+	initial_properties = {
+        collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
+        visual_size = {x = 0.4, y = 0.4, z = 0.4},
+        visual = "wielditem",
+        textures = {""},
+        physical = true,
+        collide_with_objects = false,
+        static_save = false,
+        is_visible = false
+    },
+    step = 0,
+    timer = 0,
+    spin_rate = 0,
+    throw_style = 0,
+    itemstring = "",
+    owner = "",
+    itemname = "",
+    tool_capabilities = nil,
+
+    set_item = function(self, owner, item)
+        -- Get the stack from item or itemstring.
+        local stack = ItemStack(item or self.itemstring)
+        
+        self.itemstring = stack:to_string()
+       
+        if self.itemstring == "" then
+			return
+		end
+        
+        local itemname = stack:is_known() and stack:get_name() or "unknown"
+        -- Get the name of the stack item.
+        local tool_capabilities = registered_tools[itemname].tool_capabilities
+        local max_count = stack:get_stack_max()
+		local count = min(stack:get_count(), max_count)
+        local size = 0.2 + 0.1 * (count / max_count) ^ (1 / 3)
+        
+        -- Set the entity properties.
+        self.object:set_properties({
+            is_visible = true,
+			visual = "wielditem",
+            textures = {itemname},
+            visual_size = {x = size, y = size},
+			collisionbox = {-size, -size, -size, size, size, size}
+        })
+
+        if owner then
+            self.owner = owner
+        end
+
+        self.tool_capabilities = tool_capabilities
+        self.itemname = itemname
+        self.step = tool_capabilities.projectile_step or projectile_step
+    end,
+
+    throw = function(self, user, speed, acceleration, damage, throw_style, spin_rate)
+        local obj = self.object
+        local pos = obj:get_pos()
+        local velocity = multiply(user:get_look_dir(), speed)
+
+        -- Set the entities speed and gravity.
+        obj:set_velocity(velocity)
+        obj:set_acceleration(acceleration)
+        obj:set_rotation({x = 0, y = user:get_look_horizontal() + rad90, z = asin(-normalize(velocity).y) + rad45})
+
+        -- If no damage value, auto set the damage times projectile_dmg_mul.
+        if not damage and self.tool_capabilities and self.tool_capabilities.damage_groups and self.tool_capabilities.damage_groups.fleshy then
+            self.tool_capabilities.damage_groups.fleshy = self.tool_capabilities.damage_groups.fleshy * projectile_dmg_mul
+        elseif damage and self.tool_capabilities and self.tool_capabilities.damage_groups and self.tool_capabilities.damage_groups.fleshy then
+            self.tool_capabilities.damage_groups.fleshy = damage
+        end
+
+        if spin_rate then
+            self.spin_rate = spin_rate
+        end
+
+        self.throw_style = throw_style
+        -- Set the hp to the damage.
+        self.object:set_hp(max(self.tool_capabilities.damage_groups.fleshy, 1))
+    end,
+    
+    get_staticdata = function(self)
+        -- Serialize the entitiy's data.
+        return serialize({
+            itemstring = self.itemstring,
+            itemname = self.itemname,
+            owner = self.owner,
+            tool_capabilities = self.tool_capabilities,
+            throw_style = self.throw_style,
+            spin_rate = self.spin_rate,
+            step = self.step
+        })
+    end,
+    
+    on_activate = function(self, staticdata)
+        self.object:set_armor_groups({fleshy = 100})
+        
+        local data = deserialize(staticdata)
+        
+        -- Read data only if it is a table.
+        if data and type(data) == "table" then
+            self.itemstring = data.itemstring
+            self.itemname = data.itemname
+            self.owner = data.owner
+            self.tool_capabilities = data.tool_capabilities
+            self.throw_style = data.throw_style
+            self.spin_rate = data.spin_rate
+            self.step = data.step
+        end
+
+        self.timer = self.step
+
+        self:set_item()
+    end,
+
+    on_step = function(self, dtime)
+        local tool_capabilities = self.tool_capabilities
+        local throw_style = self.throw_style
+        local object = self.object
+
+        self.timer = self.timer + dtime
+
+        -- Two different throwing styles.
+        if throw_style and throw_style == projectile_throw_style_spinning then
+            -- This style has the item spining at a fixed rate.
+            local old_rotation = object:get_rotation()
+
+            object:set_rotation({x = old_rotation.x, y = old_rotation.y, z = old_rotation.z + self.spin_rate})
+        elseif throw_style and throw_style == projectile_throw_style_dip then
+            -- This style gives the item a bullet drop effect.
+            local old_rotation = object:get_rotation()
+
+            object:set_rotation({x = old_rotation.x, y = old_rotation.y, z = asin(-normalize(object:get_velocity()).y) + rad45})
+        end
+
+        if self.timer >= self.step then
+            local velocity = object:get_velocity()
+            
+            local dir = normalize(velocity)
+            local pos = object:get_pos()
+            local p1 = add(pos, dir)
+            local projectile_dist = tool_capabilities.projectile_dist or projectile_dist
+            local p2 = add(pos, multiply(dir, projectile_dist))
+            local ray = raycast(p1, p2)
+
+            for pointed_thing in ray do
+                if pointed_thing.type == "object" then
+                    local obj = pointed_thing.ref
+
+                    if obj:get_armor_groups().fleshy then
+                        -- Add up the velocity damage.
+                        local projectile_velocity_dmg_mul = tool_capabilities.projectile_velocity_dmg_mul or projectile_velocity_dmg_mul
+
+                        if projectile_velocity_dmg_mul and tool_capabilities.damage_groups and tool_capabilities.damage_groups.fleshy then
+                            local vv
+                            
+                            if throw_style and throw_style == projectile_throw_style_dip then
+                                local projectile_dip_velocity_dmg_mul = tool_capabilities.projectile_dip_velocity_dmg_mul or projectile_dip_velocity_dmg_mul
+                                vv = max(abs(velocity.x * projectile_dip_velocity_dmg_mul.x), abs(velocity.y * projectile_dip_velocity_dmg_mul.y), abs(velocity.z * projectile_dip_velocity_dmg_mul.z))
+                            else
+                                vv = max(abs(velocity.x), abs(velocity.y), abs(velocity.z))
+                            end
+
+                            if vv > 0 then
+                                -- Give a damage bonus based on the tool's velocity.
+                                tool_capabilities.damage_groups.fleshy = tool_capabilities.damage_groups.fleshy + vv * projectile_velocity_dmg_mul
+                            end
+                        end
+
+                        -- Set the table for later use in the punch function.
+                        projectile_data = {pos = pos, name = self.itemname, dir = dir, velocity = velocity, intersection_point = pointed_thing.intersection_point}
+
+                        obj:punch(get_player_by_name(self.owner), nil, tool_capabilities)
+                        self:die()
+                        
+                        return
+                    end
+                end
+            end
+
+            -- If there is no velocity then drop the item.
+            if velocity.y == 0 or velocity.x == 0 and velocity.z == 0 then
+                self:die()
+
+                return
+            end
+
+            self.timer = 0
+        end
+    end,
+
+    on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
+        local object = self.object
+        local velocity = object:get_velocity()
+        local throw_style = self.throw_style
+        local vv
+        
+        -- Reduce the damage that will be done by the object's velocity.
+        if throw_style and throw_style == projectile_throw_style_dip then
+            vv = max(abs(velocity.x * projectile_dip_velocity_dmg_mul.x), abs(velocity.y * projectile_dip_velocity_dmg_mul.y), abs(velocity.z * projectile_dip_velocity_dmg_mul.z))
+        else
+            vv = max(abs(velocity.x), abs(velocity.y), abs(velocity.z))
+        end
+
+        if vv > 0 then
+            damage = max(damage - vv * projectile_velocity_dmg_mul, 0)
+        end
+
+        -- Reduce the item's damage.
+        self.tool_capabilities.damage_groups.fleshy = max(self.tool_capabilities.damage_groups.fleshy - damage, 0)
+        
+        -- Knockback.
+        object:add_velocity(multiply(dir, calculate_knockback(puncher, nil, time_from_last_punch, tool_capabilities, dir, distance(object:get_pos(), puncher:get_pos()), damage)))
+        object:set_hp(object:get_hp() - damage)
+        
+        return true
+    end,
+
+    die = function(self, pos)
+        -- Drop the item while giving it the same velocity.
+        if not pos then
+            pos = self.object:get_pos()
+        end
+
+        local obj = add_item(pos, self.itemstring)
+
+        if obj then
+            obj:get_luaentity().collect = true
+
+            obj:set_velocity(self.object:get_velocity())
+        end
+
+        self.object:remove()
+    end,
+
+    on_death = function(self)
+        -- On death drop the item.
+        self:die()
+    end
+})
diff --git a/globaldata.lua b/globaldata.lua
new file mode 100644
index 0000000..599f560
--- /dev/null
+++ b/globaldata.lua
@@ -0,0 +1,8 @@
+pvp_revamped.lag = 0
+pvp_revamped.projectile_data = nil
+pvp_revamped.armor_3d = nil
+pvp_revamped.player_data = {}
+pvp_revamped.player_persistent_data = {}
+pvp_revamped.hit_points = {{x = 0.3, y = 1.2, z = 0, part = 1}, 
+        {x = 0, y = 1.2, z = 0, part = 0}, 
+        {x = -0.3, y = 1.2, z = 0, part = 1}}
diff --git a/globalstep.lua b/globalstep.lua
new file mode 100644
index 0000000..c73f30b
--- /dev/null
+++ b/globalstep.lua
@@ -0,0 +1,285 @@
+local dodge_duration = pvp_revamped.config.dodge_duration
+local barrel_roll_duration = pvp_revamped.config.barrel_roll_duration
+local dodge_cooldown = pvp_revamped.config.dodge_cooldown
+local barrel_roll_cooldown = pvp_revamped.config.barrel_roll_cooldown
+local dash_cooldown = pvp_revamped.config.dash_cooldown
+local dodge_aerial_cooldown = pvp_revamped.config.dodge_aerial_cooldown
+local barrel_roll_aerial_cooldown = pvp_revamped.config.barrel_roll_aerial_cooldown
+local dash_aerial_cooldown = pvp_revamped.config.dash_aerial_cooldown
+local projectile_half_throw_mul = pvp_revamped.config.projectile_half_throw_mul
+local projectile_gravity = pvp_revamped.config.projectile_gravity
+local projectile_dmg_mul = pvp_revamped.config.projectile_dmg_mul
+local projectile_spinning_gravity_mul = pvp_revamped.config.projectile_spinning_gravity_mul
+local projectile_dip_gravity_mul = pvp_revamped.config.projectile_dip_gravity_mul
+local clash_duration = pvp_revamped.config.clash_duration
+local dash_cooldown = pvp_revamped.config.dash_cooldown
+local dash_cooldown = pvp_revamped.config.dash_cooldown
+local hasty_guard_duration = pvp_revamped.config.hasty_guard_duration
+local projectile_throw_style_dip = pvp_revamped.projectile_throw_style_dip
+local projectile_throw_style_spinning = pvp_revamped.projectile_throw_style_spinning
+local player_data = pvp_revamped.player_data
+local player_persistent_data = pvp_revamped.player_persistent_data
+local lag = pvp_revamped.lag
+local get_player_information = minetest.get_player_information
+local get_player_by_name = minetest.get_player_by_name
+local get_us_time = minetest.get_us_time
+local add_entity = minetest.add_entity
+local maxn = table.maxn
+local cos = math.cos
+local sin = math.sin
+local max = math.max
+local floor = math.floor
+
+minetest.register_globalstep(function(dtime)
+    lag = dtime * 1000000
+
+    for k, v in pairs(player_data) do
+        local server_lag = lag + get_player_information(k).avg_jitter * 1000000
+        local player = get_player_by_name(k)
+        local time = get_us_time()
+        local active
+
+        if v.block then
+            -- Check if the player is holding down the RMB key.
+            if floor(player:get_player_control_bits() / 256) % 2 == 1 then
+                -- Update the block time.
+                v.block.time = time
+            end
+
+            local block = v.block
+            
+            -- Remove the block table if it's past duration.
+            if block.time + block.duration + server_lag < time then
+                -- Revert the damage texture modifier.
+                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
+                v.block = nil
+            end
+
+            active = true
+        end
+
+        if v.shield then
+            -- Check if the player is holding down the RMB key.
+            if floor(player:get_player_control_bits() / 256) % 2 == 1 then
+                -- Update the shield time.
+                v.shield.time = time
+            end
+
+            local shield = v.shield
+
+            -- Remove the shield table if it's past duration.
+            if shield.time + shield.duration + server_lag < time then
+                -- Revert the damage texture modifier.
+                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
+                v.shield = nil
+            end
+
+            active = true
+        end
+
+        if v.throw then
+            local control_bits = player:get_player_control_bits()
+            
+            -- If neither LMB or RMB is down then throw the item.
+            if floor(control_bits / 128) % 2 ~= 1 and floor(control_bits / 256) % 2 ~= 1 then
+                local pos = player:get_pos()
+
+                pos.y = pos.y + player:get_properties().eye_height
+                
+                local obj = add_entity(pos, "pvp_revamped:projectile")
+                local ent = obj:get_luaentity()
+
+                if ent then
+                    local name = k
+                    local throw_style = player_persistent_data[name].throw_style
+                    local throw_data = v.throw
+                    local tool_capabilities = throw_data.tool_capabilities
+                    local throw_speed = tool_capabilities.throw_speed
+                    local damage = tool_capabilities.damage_groups.fleshy
+                    local full_throw = throw_data.time + tool_capabilities.full_throw
+                    local projectile_gravity = tool_capabilities.projectile_gravity or projectile_gravity
+                    local gravity = projectile_gravity
+                    local projectile_dmg_mul = tool_capabilities.projectile_dmg_mul or projectile_dmg_mul
+                    local projectile_spinning_gravity_mul = tool_capabilities.projectile_spinning_gravity_mul or projectile_spinning_gravity_mul
+                    local projectile_dip_gravity_mul = tool_capabilities.projectile_dip_gravity_mul or projectile_dip_gravity_mul
+                    local spin
+
+                    if full_throw > time + server_lag then
+                        local projectile_half_throw_mul = tool_capabilities.projectile_half_throw_mul or projectile_half_throw_mul
+                        local re = (full_throw - time) * projectile_half_throw_mul
+
+                        if re > 0.5 then
+                            damage = tool_capabilities.damage_groups.fleshy - re
+                            throw_speed = throw_speed - re
+                        end
+                    end
+
+                    if throw_style == projectile_throw_style_spinning then
+                        spin = throw_speed
+                        gravity = gravity * projectile_spinning_gravity_mul
+                    elseif throw_style == projectile_throw_style_dip then
+                        gravity = gravity * projectile_dip_gravity_mul
+                    end
+
+                    ent:set_item(name, throw_data.item)
+                    ent:throw(player, throw_speed, {x = 0, y = gravity, z = 0}, max(damage * projectile_dmg_mul, 0.1), throw_style, spin)
+                end
+
+                v.throw = nil
+            end
+
+            active = true
+        end
+
+        if v.stagger then
+            local stagger = v.stagger
+
+            -- Check if the stagger duration expired. 
+            if stagger.time + stagger.value + server_lag < time then
+                -- Restore the player's physics.
+                get_player_by_name(k):set_physics_override({speed = 1, jump = 1})
+                v.stagger = nil
+            end
+
+            active = true
+        end
+
+        if v.barrel_roll then
+            local active_barrel_rolls = nil
+            
+            -- Process the player's barrel_roll table cooldown.
+            for j, l in pairs(v.barrel_roll) do
+                -- Find if it's aerial or not.
+                if j > 4 and l.time + barrel_roll_aerial_cooldown + server_lag < time then
+                    v.barrel_roll[j] = nil
+                elseif j < 5 and l.time + barrel_roll_cooldown + server_lag < time then
+                    v.barrel_roll[j] = nil
+                elseif l.time + barrel_roll_duration + server_lag > time then
+
+                    local yaw = player:get_look_horizontal()
+                    local co = cos(yaw)
+                    local si = sin(yaw)
+                    local x = l.x
+                    local z = l.z
+                    local re_x = co * x - si * z
+                    local re_z = si * x + co * z
+
+                    player:add_player_velocity({x = re_x, y = 0, z = re_z})
+                    active_barrel_rolls = true
+                end
+            end
+
+            if not active_barrel_rolls and player:get_properties().damage_texture_modifier == "" then
+                -- Revert the damage texture modifier.
+                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
+            end
+
+            -- Store the barrel_roll amount for later use.
+            player_persistent_data[k].active_barrel_rolls = active_barrel_rolls
+
+            -- If this table contains no more barrel_rolls remove it.
+            if maxn(v.barrel_roll) < 1 then
+                v.barrel_roll = nil
+            end
+
+            active = true
+        end
+
+        if v.dodge then
+            local active_dodges = nil
+            
+            -- Process the player's dodge table cooldown.
+            for j, l in pairs(v.dodge) do
+                -- Find if it's aerial or not.
+                if j > 4 and l + dodge_aerial_cooldown + server_lag < time then
+                    v.dodge[j] = nil
+                elseif j < 5 and l + dodge_cooldown + server_lag < time then
+                    v.dodge[j] = nil
+                elseif l + dodge_duration + server_lag > time then
+                    active_dodges = true
+                end
+            end
+
+            if not active_dodges and player:get_properties().damage_texture_modifier == "" then
+                -- Revert the damage texture modifier.
+                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
+            end
+
+            -- Store the dodge amount for later use.
+            player_persistent_data[k].active_dodges = active_dodges
+
+            -- If this table contains no more dodges remove it.
+            if maxn(v.dodge) < 1 then
+                v.dodge = nil
+            end
+
+            active = true
+        end
+
+        if v.dash then
+            -- Process the player's dash table cooldown.
+            for j, l in pairs(v.dash) do
+                -- Find if it's aerial or not.
+                if j > 4 and l + dash_aerial_cooldown + server_lag < time then
+                    v.dash[j] = nil
+                elseif j < 5 and l + dash_cooldown + server_lag < time then
+                    v.dash[j] = nil
+                end
+            end
+
+            -- If this table contains no more dashes remove it.
+            if maxn(v.dash) < 1 then
+                v.dash = nil
+            end
+
+            active = true
+        end
+
+        if v.hit then
+            local hit_data = v.hit
+            local hp = player:get_hp()
+            local hp_change
+
+            for i = #hit_data, 1, -1 do
+                local data = hit_data[i]
+
+                if data.resolved or data.time + clash_duration + server_lag < time then
+                    local block = v.block
+                    local shield = v.shield
+
+                    local damage = data.damage
+                    
+                    -- If the player was able to pull off a hasty guard cancel the attack.
+                     if damage > 0 and not (block and block.initial_time + block.hasty_guard_duration + server_lag > time) and not (shield and shield.initial_time + shield.hasty_guard_duration + server_lag > time) then
+                        hp = hp - damage
+                        hp_change = true
+                    elseif damage < 0 then
+                        local hitter = get_player_by_name(data.name)
+
+                        hitter:set_hp(hitter:get_hp() + damage)
+                    end
+
+                    local count = #hit_data
+
+                    hit_data[i] = hit_data[count]
+                    hit_data[count] = nil
+                end
+            end
+
+            if hp_change then
+                player:set_hp(hp)
+            end
+
+            -- If this table contains no more hits remove it.
+            if maxn(hit_data) < 1 then
+                v.hit = nil
+            end
+
+            active = true
+        end
+
+        if not active then
+            player_data[k] = nil
+        end
+    end
+end)
diff --git a/helper.lua b/helper.lua
new file mode 100644
index 0000000..7d337f3
--- /dev/null
+++ b/helper.lua
@@ -0,0 +1,26 @@
+local add_item = minetest.add_item
+
+-- Helper function to drop an item.
+function pvp_revamped.drop(player, item, pos)
+    if not pos then
+        pos = player:get_pos()
+    end
+
+    local obj = add_item(pos, item)
+
+    if obj then
+        obj:get_luaentity().collect = true
+    end
+end
+
+local player_data = pvp_revamped.player_data
+
+function pvp_revamped.get_player_data(name)
+    local data = player_data[name] or {}
+
+    if not player_data[name] then
+        player_data[name] = data
+    end
+
+    return data
+end
diff --git a/init.lua b/init.lua
index 64c56de..64848cc 100644
--- a/init.lua
+++ b/init.lua
@@ -1,1728 +1,16 @@
-local head_height = tonumber(minetest.settings:get("pvp_revamped.head_height")) or 1.35
-local torso_height = tonumber(minetest.settings:get("pvp_revamped.torso_height")) or 0.75
-local leg_height = tonumber(minetest.settings:get("pvp_revamped.leg_height")) or 0.45
-local knee_height = tonumber(minetest.settings:get("pvp_revamped.knee_height")) or 0.375
-local block_duration = tonumber(minetest.settings:get("pvp_revamped.block_duration")) or 100000
-local dodge_duration = tonumber(minetest.settings:get("pvp_revamped.dodge_duration"))  or 350000
-local barrel_roll_duration = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_duration"))  or 500000
-local dodge_cooldown = tonumber(minetest.settings:get("pvp_revamped.dodge_cooldown"))  or 1500000
-local barrel_roll_cooldown = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_cooldown"))  or 5000000
-local dash_cooldown = tonumber(minetest.settings:get("pvp_revamped.dash_cooldown"))  or 2000000
-local dodge_aerial_cooldown = tonumber(minetest.settings:get("pvp_revamped.dodge_aerial_cooldown"))  or 5000000
-local barrel_roll_aerial_cooldown = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_aerial_cooldown"))  or 10000000
-local dash_aerial_cooldown = tonumber(minetest.settings:get("pvp_revamped.dash_aerial_cooldown"))  or 4000000
-local dash_speed = tonumber(minetest.settings:get("pvp_revamped.dash_speed")) or 9.2
-local barrel_roll_speed = tonumber(minetest.settings:get("pvp_revamped.barrel_roll_speed")) or 1
-local disarm_chance_mul = tonumber(minetest.settings:get("pvp_revamped.disarm_chance_mul")) or 2
-local leg_stagger_mul = tonumber(minetest.settings:get("pvp_revamped.leg_stagger_mul")) or 0.8
-local knee_stagger_mul = tonumber(minetest.settings:get("pvp_revamped.knee_stagger_mul")) or 1.5
-local stagger_mul = tonumber(minetest.settings:get("pvp_revamped.stagger_mul")) or 100000
-local block_duration_mul = tonumber(minetest.settings:get("pvp_revamped.block_duration_mul")) or 100000
-local block_interval_mul = tonumber(minetest.settings:get("pvp_revamped.block_interval_mul")) or 0.15
-local block_pool_mul = tonumber(minetest.settings:get("pvp_revamped.block_pool_mul")) or 2
-local shield_duration = tonumber(minetest.settings:get("pvp_revamped.shield_duration")) or 100000
-local shield_duration_mul = tonumber(minetest.settings:get("pvp_revamped.shield_duration_mul")) or 100000
-local shield_pool_mul = tonumber(minetest.settings:get("pvp_revamped.shield_pool_mul")) or 4
-local block_wear_mul = tonumber(minetest.settings:get("pvp_revamped.block_wear_mul")) or 9000
-local shield_axe_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.shield_axe_dmg_mul")) or 20
-local head_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.head_dmg_mul")) or 1.2
-local torso_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.torso_dmg_mul")) or 1.0
-local arm_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.arm_dmg_mul")) or 0.6
-local leg_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.leg_dmg_mul")) or 0.7
-local front_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.front_dmg_mul")) or nil
-local side_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.side_dmg_mul")) or 1.05
-local back_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.back_dmg_mul")) or 1.1
-local elevated_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.elevated_dmg_mul")) or 1.5
-local equal_height_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.equal_height_dmg_mul")) or nil
-local lower_elevation_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.lower_elevation_dmg_mul")) or 0.9
-local velocity_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.velocity_dmg_mul")) or 0.15
-local optimal_distance_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.optimal_distance_dmg_mul")) or 0.2
-local maximum_distance_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.maximum_distance_dmg_mul")) or 0.1
-local optimal_distance_mul = tonumber(minetest.settings:get("pvp_revamped.optimal_distance_mul")) or 0.625
-local projectile_full_throw_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_full_throw_mul")) or 2
-local projectile_half_throw_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_half_throw_mul")) or 0.000005
-local projectile_speed_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_speed_mul")) or 3
-local projectile_gravity = tonumber(minetest.settings:get("pvp_revamped.projectile_gravity")) or -10
-local projectile_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_dmg_mul")) or 0.5
-local projectile_velocity_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_velocity_dmg_mul")) or 0.01
-local projectile_step = tonumber(minetest.settings:get("pvp_revamped.projectile_step")) or 0.15
-local projectile_dist = tonumber(minetest.settings:get("pvp_revamped.projectile_dist")) or 5
-local projectile_spinning_gravity_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_spinning_gravity_mul")) or 0.5
-local projectile_dip_gravity_mul = tonumber(minetest.settings:get("pvp_revamped.projectile_dip_gravity_mul")) or 1.2
-local xyz = minetest.settings:get("pvp_revamped.projectile_dip_velocity_dmg_mul") or {1, 2, 1}
-if xyz and type(xyz) == "string" then
-    xyz = minetest.settings:get("pvp_revamped.projectile_dip_velocity_dmg_mul"):split(" ")
-end
-local projectile_dip_velocity_dmg_mul = {x = tonumber(xyz[1]), y = tonumber(xyz[2]), z = tonumber(xyz[3])}
-local projectile_throw_style_dip = 1
-local projectile_throw_style_spinning = 2
-local parry_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.parry_dmg_mul")) or 1.2
-local counter_dmg_mul = tonumber(minetest.settings:get("pvp_revamped.counter_dmg_mul")) or 1.5
-local clash_duration = tonumber(minetest.settings:get("pvp_revamped.clash_duration")) or 150000
-local counter_duration = tonumber(minetest.settings:get("pvp_revamped.counter_duration")) or 100000
-local hasty_guard_duration = tonumber(minetest.settings:get("pvp_revamped.hasty_guard_duration")) or 50000
-local hasty_guard_mul = tonumber(minetest.settings:get("pvp_revamped.hasty_guard_mul")) or 1000
-local hasty_shield_mul = tonumber(minetest.settings:get("pvp_revamped.hasty_shield_mul")) or 1000
-local lag = 0
-local projectile_data
-local armor_3d
-local player_data = {}
-local player_persistent_data = {}
-
-local hit_points = {{x = 0.3, y = 1.2, z = 0, part = 1}, 
-        {x = 0, y = 1.2, z = 0, part = 0}, 
-        {x = -0.3, y = 1.2, z = 0, part = 1}}
-
-local registered_tools = minetest.registered_tools
-local raycast = minetest.raycast
-local get_us_time = minetest.get_us_time
-local get_player_by_name = minetest.get_player_by_name
-local get_player_information = minetest.get_player_information
-local serialize = minetest.serialize
-local deserialize = minetest.deserialize
-local add_item = minetest.add_item
-local add_entity = minetest.add_entity
-local calculate_knockback = minetest.calculate_knockback
-local get_item_group = minetest.get_item_group
-local get_connected_players = minetest.get_connected_players
-local get_inventory = minetest.get_inventory
-local maxn = table.maxn
-local insert = table.insert
-local add = vector.add
-local multiply = vector.multiply
-local subtract = vector.subtract
-local distance = vector.distance
-local normalize = vector.normalize
-local cos = math.cos
-local sin = math.sin
-local abs = math.abs
-local atan = math.atan
-local random = math.random
-local max = math.max
-local min = math.min
-local floor = math.floor
-local asin = math.asin
-local pi = math.pi
-local rad45 = pi * 0.25
-local rad90 = pi * 0.5
-local rad360 = pi * 2
-
-local function get_player_data(name)
-    local data = player_data[name] or {}
-
-    if not player_data[name] then
-        player_data[name] = data
-    end
-
-    return data
-end
-
--- Entity for thrown items.
-minetest.register_entity("pvp_revamped:projectile", {
-	initial_properties = {
-        collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.3, 0.3},
-        visual_size = {x = 0.4, y = 0.4, z = 0.4},
-        visual = "wielditem",
-        textures = {""},
-        physical = true,
-        collide_with_objects = false,
-        static_save = false,
-        is_visible = false
-    },
-    step = 0,
-    timer = 0,
-    spin_rate = 0,
-    throw_style = 0,
-    itemstring = "",
-    owner = "",
-    itemname = "",
-    tool_capabilities = nil,
-
-    set_item = function(self, owner, item)
-        -- Get the stack from item or itemstring.
-        local stack = ItemStack(item or self.itemstring)
-        
-        self.itemstring = stack:to_string()
-       
-        if self.itemstring == "" then
-			return
-		end
-        
-        local itemname = stack:is_known() and stack:get_name() or "unknown"
-        -- Get the name of the stack item.
-        local tool_capabilities = registered_tools[itemname].tool_capabilities
-        local max_count = stack:get_stack_max()
-		local count = min(stack:get_count(), max_count)
-        local size = 0.2 + 0.1 * (count / max_count) ^ (1 / 3)
-        
-        -- Set the entity properties.
-        self.object:set_properties({
-            is_visible = true,
-			visual = "wielditem",
-            textures = {itemname},
-            visual_size = {x = size, y = size},
-			collisionbox = {-size, -size, -size, size, size, size}
-        })
-
-        if owner then
-            self.owner = owner
-        end
-
-        self.tool_capabilities = tool_capabilities
-        self.itemname = itemname
-        self.step = tool_capabilities.projectile_step or projectile_step
-    end,
-
-    throw = function(self, user, speed, acceleration, damage, throw_style, spin_rate)
-        local obj = self.object
-        local pos = obj:get_pos()
-        local velocity = multiply(user:get_look_dir(), speed)
-
-        -- Set the entities speed and gravity.
-        obj:set_velocity(velocity)
-        obj:set_acceleration(acceleration)
-        obj:set_rotation({x = 0, y = user:get_look_horizontal() + rad90, z = asin(-normalize(velocity).y) + rad45})
-
-        -- If no damage value, auto set the damage times projectile_dmg_mul.
-        if not damage and self.tool_capabilities and self.tool_capabilities.damage_groups and self.tool_capabilities.damage_groups.fleshy then
-            self.tool_capabilities.damage_groups.fleshy = self.tool_capabilities.damage_groups.fleshy * projectile_dmg_mul
-        elseif damage and self.tool_capabilities and self.tool_capabilities.damage_groups and self.tool_capabilities.damage_groups.fleshy then
-            self.tool_capabilities.damage_groups.fleshy = damage
-        end
-
-        if spin_rate then
-            self.spin_rate = spin_rate
-        end
-
-        self.throw_style = throw_style
-        -- Set the hp to the damage.
-        self.object:set_hp(max(self.tool_capabilities.damage_groups.fleshy, 1))
-    end,
-    
-    get_staticdata = function(self)
-        -- Serialize the entitiy's data.
-        return serialize({
-            itemstring = self.itemstring,
-            itemname = self.itemname,
-            owner = self.owner,
-            tool_capabilities = self.tool_capabilities,
-            throw_style = self.throw_style,
-            spin_rate = self.spin_rate,
-            step = self.step
-        })
-    end,
-    
-    on_activate = function(self, staticdata)
-        self.object:set_armor_groups({fleshy = 100})
-        
-        local data = deserialize(staticdata)
-        
-        -- Read data only if it is a table.
-        if data and type(data) == "table" then
-            self.itemstring = data.itemstring
-            self.itemname = data.itemname
-            self.owner = data.owner
-            self.tool_capabilities = data.tool_capabilities
-            self.throw_style = data.throw_style
-            self.spin_rate = data.spin_rate
-            self.step = data.step
-        end
-
-        self.timer = self.step
-
-        self:set_item()
-    end,
-
-    on_step = function(self, dtime)
-        local tool_capabilities = self.tool_capabilities
-        local throw_style = self.throw_style
-        local object = self.object
-
-        self.timer = self.timer + dtime
-
-        -- Two different throwing styles.
-        if throw_style and throw_style == projectile_throw_style_spinning then
-            -- This style has the item spining at a fixed rate.
-            local old_rotation = object:get_rotation()
-
-            object:set_rotation({x = old_rotation.x, y = old_rotation.y, z = old_rotation.z + self.spin_rate})
-        elseif throw_style and throw_style == projectile_throw_style_dip then
-            -- This style gives the item a bullet drop effect.
-            local old_rotation = object:get_rotation()
-
-            object:set_rotation({x = old_rotation.x, y = old_rotation.y, z = asin(-normalize(object:get_velocity()).y) + rad45})
-        end
-
-        if self.timer >= self.step then
-            local velocity = object:get_velocity()
-            
-            local dir = normalize(velocity)
-            local pos = object:get_pos()
-            local p1 = add(pos, dir)
-            local projectile_dist = tool_capabilities.projectile_dist or projectile_dist
-            local p2 = add(pos, multiply(dir, projectile_dist))
-            local ray = raycast(p1, p2)
-
-            for pointed_thing in ray do
-                if pointed_thing.type == "object" then
-                    local obj = pointed_thing.ref
-
-                    if obj:get_armor_groups().fleshy then
-                        -- Add up the velocity damage.
-                        local projectile_velocity_dmg_mul = tool_capabilities.projectile_velocity_dmg_mul or projectile_velocity_dmg_mul
-
-                        if projectile_velocity_dmg_mul and tool_capabilities.damage_groups and tool_capabilities.damage_groups.fleshy then
-                            local vv
-                            
-                            if throw_style and throw_style == projectile_throw_style_dip then
-                                local projectile_dip_velocity_dmg_mul = tool_capabilities.projectile_dip_velocity_dmg_mul or projectile_dip_velocity_dmg_mul
-                                vv = max(abs(velocity.x * projectile_dip_velocity_dmg_mul.x), abs(velocity.y * projectile_dip_velocity_dmg_mul.y), abs(velocity.z * projectile_dip_velocity_dmg_mul.z))
-                            else
-                                vv = max(abs(velocity.x), abs(velocity.y), abs(velocity.z))
-                            end
-
-                            if vv > 0 then
-                                -- Give a damage bonus based on the tool's velocity.
-                                tool_capabilities.damage_groups.fleshy = tool_capabilities.damage_groups.fleshy + vv * projectile_velocity_dmg_mul
-                            end
-                        end
-
-                        -- Set the table for later use in the punch function.
-                        projectile_data = {pos = pos, name = self.itemname, dir = dir, velocity = velocity, intersection_point = pointed_thing.intersection_point}
-
-                        obj:punch(get_player_by_name(self.owner), nil, tool_capabilities)
-                        self:die()
-                        
-                        return
-                    end
-                end
-            end
-
-            -- If there is no velocity then drop the item.
-            if velocity.y == 0 or velocity.x == 0 and velocity.z == 0 then
-                self:die()
-
-                return
-            end
-
-            self.timer = 0
-        end
-    end,
-
-    on_punch = function(self, puncher, time_from_last_punch, tool_capabilities, dir, damage)
-        local object = self.object
-        local velocity = object:get_velocity()
-        local throw_style = self.throw_style
-        local vv
-        
-        -- Reduce the damage that will be done by the object's velocity.
-        if throw_style and throw_style == projectile_throw_style_dip then
-            vv = max(abs(velocity.x * projectile_dip_velocity_dmg_mul.x), abs(velocity.y * projectile_dip_velocity_dmg_mul.y), abs(velocity.z * projectile_dip_velocity_dmg_mul.z))
-        else
-            vv = max(abs(velocity.x), abs(velocity.y), abs(velocity.z))
-        end
-
-        if vv > 0 then
-            damage = max(damage - vv * projectile_velocity_dmg_mul, 0)
-        end
-
-        -- Reduce the item's damage.
-        self.tool_capabilities.damage_groups.fleshy = max(self.tool_capabilities.damage_groups.fleshy - damage, 0)
-        
-        -- Knockback.
-        object:add_velocity(multiply(dir, calculate_knockback(puncher, nil, time_from_last_punch, tool_capabilities, dir, distance(object:get_pos(), puncher:get_pos()), damage)))
-        object:set_hp(object:get_hp() - damage)
-        
-        return true
-    end,
-
-    die = function(self, pos)
-        -- Drop the item while giving it the same velocity.
-        if not pos then
-            pos = self.object:get_pos()
-        end
-
-        local obj = add_item(pos, self.itemstring)
-
-        if obj then
-            obj:get_luaentity().collect = true
-
-            obj:set_velocity(self.object:get_velocity())
-        end
-
-        self.object:remove()
-    end,
-
-    on_death = function(self)
-        -- On death drop the item.
-        self:die()
-    end
-})
-
-minetest.register_on_mods_loaded(function()
-    local max_armor_use
-
-    for k, v in pairs(registered_tools) do
-        if v.groups and v.groups.armor_use then
-            if not max_armor_use or max_armor_use < v.groups.armor_use then
-                -- Get the max armor_use.
-                max_armor_use = v.groups.armor_use
-            end
-        end
-
-        if v.tool_capabilities and v.tool_capabilities.groupcaps and v.tool_capabilities.groupcaps.choppy then
-            -- Compute the damage an axe would do to a shield.
-            local tool_capabilities = v.tool_capabilities
-            local choppy = tool_capabilities.groupcaps.choppy
-            local uxml = choppy.uses * choppy.maxlevel
-            local shield_axe_dmg_mul = tool_capabilities.shield_axe_dmg_mul or shield_axe_dmg_mul
-
-            tool_capabilities.damage_groups.shield = uxml * shield_axe_dmg_mul
-
-            minetest.override_item(k, {tool_capabilities = tool_capabilities})
-        end
-
-        if v.tool_capabilities and v.tool_capabilities.full_punch_interval then
-            -- Calculate the time it takes to fully throw an item at max velocity and damage.
-            local tool_capabilities = v.tool_capabilities
-            local projectile_full_throw_mul = tool_capabilities.projectile_full_throw_mul or projectile_full_throw_mul
-
-            tool_capabilities.full_throw = (v.tool_capabilities.full_punch_interval * projectile_full_throw_mul) * 1000000
-            
-            minetest.override_item(k, {tool_capabilities = tool_capabilities})
-        end
-
-        if v.tool_capabilities then
-            -- Calculate the item throw speed.
-            local tool_capabilities = v.tool_capabilities
-            local range = 4
-            local projectile_speed_mul = tool_capabilities.projectile_speed_mul or projectile_speed_mul
-
-            if v.tool_capabilities.range then
-                range = v.tool_capabilities.range
-            end
-
-            tool_capabilities.throw_speed = range * projectile_speed_mul
-
-            minetest.override_item(k, {tool_capabilities = tool_capabilities})
-        end
-    end
-
-    for k, v in pairs(registered_tools) do
-        if not (max_armor_use and v.groups and v.groups.armor_shield) and v.tool_capabilities and v.tool_capabilities.damage_groups.fleshy and v.tool_capabilities.full_punch_interval then
-            -- Block feature for tools with combat ability.
-            local tool_capabilities = v.tool_capabilities
-            local full_punch_interval = tool_capabilities.full_punch_interval
-            local punch_number = max(tool_capabilities.damage_groups.fleshy - full_punch_interval, 0.1)
-            local block_pool_mul = tool_capabilities.block_pool_mul or block_pool_mul
-            local block_pool = punch_number * block_pool_mul
-            local block_interval_mul = tool_capabilities.block_interval_mul or block_interval_mul
-            local full_block_interval = (full_punch_interval * block_interval_mul) * 1000000
-            local block_duration = tool_capabilities.block_duration or block_duration
-            local block_duration_mul = tool_capabilities.block_duration_mul or block_duration_mul
-            local duration = block_duration + (punch_number * block_duration_mul)
-            local old_on_secondary_use = v.on_secondary_use
-            local old_on_place = v.on_place
-            local old_on_drop = v.on_drop
-            local hasty_guard_mul = tool_capabilities.hasty_guard_mul or hasty_guard_mul
-            local hasty_guard_duration = tool_capabilities.hasty_guard_duration or hasty_guard_duration
-            
-            -- Override some custom capabilities if they are nil.
-            tool_capabilities.block_pool = tool_capabilities.block_pool or block_pool
-            tool_capabilities.duration = tool_capabilities.duration or duration
-            tool_capabilities.parry_dmg_mul = tool_capabilities.parry_dmg_mul or parry_dmg_mul
-            tool_capabilities.clash_def_mul = tool_capabilities.clash_def_mul or 0.5
-            tool_capabilities.counter_dmg_mul = tool_capabilities.counter_dmg_mul or counter_dmg_mul
-            tool_capabilities.counter_duration = tool_capabilities.counter_duration or counter_duration
-            tool_capabilities.hasty_guard_duration = tool_capabilities.hasty_guard_duration or hasty_guard_duration + punch_number * hasty_guard_mul
-            
-            if block_pool > 0 then
-                -- Allow the tool to block damage.
-                local function block_action(user)
-                    local name = user:get_player_name()
-
-                    -- Cancel if the player is throwing something.
-                    if get_player_data(name).throw then
-                        return
-                    end
-
-                    local player_pdata = player_persistent_data[name]
-                    local control_bits = user:get_player_control_bits()
-                    local time = get_us_time()
-
-                    -- Use 3d_armor inv shield if available.
-                    if armor_3d and player_pdata.inventory_armor_shield and (player_pdata.use_shield or floor(control_bits / 64) % 2 == 1) then
-                        local data_shield = player_pdata.inventory_armor_shield
-                        local data = player_data[name]
-
-                        data.shield = {pool = data_shield.block_pool, name = data_shield.name, index = data_shield.index, initial_time = time, time = time, duration = data_shield.duration, hasty_guard_duration = data_shield.hasty_guard_duration, armor_inv = true}
-                        data.block = nil
-                        player_data[name] = data
-                        
-                        user:set_properties{damage_texture_modifier = ""}
-
-                        return
-                    end
-
-                    local data = player_data[name]
-
-                    -- Prevent spam blocking.
-                    if not data.block or time - data.block.time > full_block_interval then
-                        data.block = {pool = block_pool, name = k, initial_time = time, time = time, duration = duration, hasty_guard_duration = hasty_guard_duration}
-                        data.shield = nil
-                    end
-
-                    -- Disable the damage texture modifier on tool block.
-                    user:set_properties{damage_texture_modifier = ""}
-
-                    player_data[name] = data
-                end
-
-                minetest.override_item(k, {on_secondary_use = function(itemstack, user, pointed_thing)
-                    block_action(user)
-
-                    return old_on_secondary_use(itemstack, user, pointed_thing)
-                end, on_place = function(itemstack, placer, pointed_thing)
-                    block_action(placer)
-
-                    return old_on_place(itemstack, placer, pointed_thing)
-                end, on_drop = function(itemstack, dropper, pos)
-                    local name = itemstack:get_name()
-                    local player_name = dropper:get_player_name()
-                    local control_bits = dropper:get_player_control_bits()
-                    local throw_data = get_player_data(player_name).throw
-
-                    -- If in the process of throwing, either LMB, RMB, or item name is not the same then return the old function.
-                    if throw_data or dropper:get_wielded_item():get_name() ~= name or (floor(control_bits / 128) % 2 ~= 1 and floor(control_bits / 256) % 2 ~= 1) then 
-                        return old_on_drop(itemstack, dropper, pos)
-                    end
-
-                    throw_data = {name = name, time = get_us_time(), item = itemstack:take_item(), tool_capabilities = registered_tools[name].tool_capabilities}
-                    player_data[player_name].throw = throw_data
-
-                    return itemstack
-                end, tool_capabilities = tool_capabilities})
-            end
-        elseif max_armor_use and v.groups and v.groups.armor_shield then
-            -- Block feature for shields.
-            local groups = v.groups
-            local armor_heal = groups.armor_heal or 0
-            local armor_use = groups.armor_use or 0
-            local armor_shield = groups.armor_shield or 1
-            local old_on_secondary_use = v.on_secondary_use
-            local old_on_place = v.on_place
-            local fleshy = 1
-            
-            if v.armor_groups and v.armor_groups.fleshy then
-                fleshy = v.armor_groups.fleshy
-            end
-            
-            local value = armor_heal + armor_shield + fleshy
-            local shield_pool_mul = groups.shield_pool_mul or shield_pool_mul
-            local block_pool = max_armor_use - armor_use + value * shield_pool_mul
-            local shield_duration = groups.shield_duration or shield_duration
-            local duration = shield_duration + (armor_use + value) * shield_duration_mul
-            local hasty_shield_mul = groups.hasty_shield_mul or hasty_shield_mul
-
-            -- Write new capabilities if they are nil.
-            groups.block_pool = groups.block_pool or block_pool
-            groups.duration = groups.duration or duration
-            groups.hasty_guard_duration = groups.hasty_guard_duration or hasty_guard_duration
-            groups.hasty_guard_duration = groups.hasty_guard_duration + value * hasty_shield_mul
-
-            if block_pool > 0 then
-                -- Allow the shield to block damage.
-                local function block_action(user)
-                    local name = user:get_player_name()
-
-                    -- Cancel if the player is throwing something.
-                    if get_player_data(name).throw then
-                        return
-                    end
-
-                    local player_pdata = player_persistent_data[name]
-                    local control_bits = user:get_player_control_bits()
-                    local time = get_us_time()
-
-                    -- Use 3d_armor inv shield if available.
-                    if armor_3d and player_pdata.inventory_armor_shield and (player_pdata.use_shield or floor(control_bits / 64) % 2 == 1) then
-                        local data_shield = player_pdata.inventory_armor_shield
-                        local data = player_data[name]
-
-                        data.shield = {pool = data_shield.block_pool, name = data_shield.name, index = data_shield.index, initial_time = time, time = time, duration = data_shield.duration, hasty_guard_duration = data_shield.hasty_guard_duration, armor_inv = true}
-                        data.block = nil
-                        player_data[name] = data
-                        
-                        user:set_properties{damage_texture_modifier = ""}
-
-                        return
-                    end
-
-                    local data = player_data[name]
-
-                    data.shield = {pool = block_pool, name = k, initial_time = time, time = time, duration = duration, hasty_guard_duration = hasty_guard_duration}
-                    data.block = nil
-
-                    player_data[name] = data
-
-                    -- Disable the damage texture modifier on shield block.
-                    user:set_properties{damage_texture_modifier = ""}
-                end
-
-                minetest.override_item(k, {on_secondary_use = function(itemstack, user, pointed_thing)
-                    block_action(user)
-
-                    return old_on_secondary_use(itemstack, user, pointed_thing)
-                end, on_place = function(itemstack, placer, pointed_thing)
-                    block_action(placer)
-
-                    return old_on_place(itemstack, placer, pointed_thing)
-                end, groups = groups})
-            end
-        end
-    end
-end)
-
-minetest.register_globalstep(function(dtime)
-    lag = dtime * 1000000
-
-    for k, v in pairs(player_data) do
-        local server_lag = lag + get_player_information(k).avg_jitter * 1000000
-        local player = get_player_by_name(k)
-        local time = get_us_time()
-        local active
-
-        if v.block then
-            -- Check if the player is holding down the RMB key.
-            if floor(player:get_player_control_bits() / 256) % 2 == 1 then
-                -- Update the block time.
-                v.block.time = time
-            end
-
-            local block = v.block
-            
-            -- Remove the block table if it's past duration.
-            if block.time + block.duration + server_lag < time then
-                -- Revert the damage texture modifier.
-                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
-                v.block = nil
-            end
-
-            active = true
-        end
-
-        if v.shield then
-            -- Check if the player is holding down the RMB key.
-            if floor(player:get_player_control_bits() / 256) % 2 == 1 then
-                -- Update the shield time.
-                v.shield.time = time
-            end
-
-            local shield = v.shield
-
-            -- Remove the shield table if it's past duration.
-            if shield.time + shield.duration + server_lag < time then
-                -- Revert the damage texture modifier.
-                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
-                v.shield = nil
-            end
-
-            active = true
-        end
-
-        if v.throw then
-            local control_bits = player:get_player_control_bits()
-            
-            -- If neither LMB or RMB is down then throw the item.
-            if floor(control_bits / 128) % 2 ~= 1 and floor(control_bits / 256) % 2 ~= 1 then
-                local pos = player:get_pos()
-
-                pos.y = pos.y + player:get_properties().eye_height
-                
-                local obj = add_entity(pos, "pvp_revamped:projectile")
-                local ent = obj:get_luaentity()
-
-                if ent then
-                    local name = k
-                    local throw_style = player_persistent_data[name].throw_style
-                    local throw_data = v.throw
-                    local tool_capabilities = throw_data.tool_capabilities
-                    local throw_speed = tool_capabilities.throw_speed
-                    local damage = tool_capabilities.damage_groups.fleshy
-                    local full_throw = throw_data.time + tool_capabilities.full_throw
-                    local projectile_gravity = tool_capabilities.projectile_gravity or projectile_gravity
-                    local gravity = projectile_gravity
-                    local projectile_dmg_mul = tool_capabilities.projectile_dmg_mul or projectile_dmg_mul
-                    local projectile_spinning_gravity_mul = tool_capabilities.projectile_spinning_gravity_mul or projectile_spinning_gravity_mul
-                    local projectile_dip_gravity_mul = tool_capabilities.projectile_dip_gravity_mul or projectile_dip_gravity_mul
-                    local spin
-
-                    if full_throw > time + server_lag then
-                        local projectile_half_throw_mul = tool_capabilities.projectile_half_throw_mul or projectile_half_throw_mul
-                        local re = (full_throw - time) * projectile_half_throw_mul
-
-                        if re > 0.5 then
-                            damage = tool_capabilities.damage_groups.fleshy - re
-                            throw_speed = throw_speed - re
-                        end
-                    end
-
-                    if throw_style == projectile_throw_style_spinning then
-                        spin = throw_speed
-                        gravity = gravity * projectile_spinning_gravity_mul
-                    elseif throw_style == projectile_throw_style_dip then
-                        gravity = gravity * projectile_dip_gravity_mul
-                    end
-
-                    ent:set_item(name, throw_data.item)
-                    ent:throw(player, throw_speed, {x = 0, y = gravity, z = 0}, max(damage * projectile_dmg_mul, 0.1), throw_style, spin)
-                end
-
-                v.throw = nil
-            end
-
-            active = true
-        end
-
-        if v.stagger then
-            local stagger = v.stagger
-
-            -- Check if the stagger duration expired. 
-            if stagger.time + stagger.value + server_lag < time then
-                -- Restore the player's physics.
-                get_player_by_name(k):set_physics_override({speed = 1, jump = 1})
-                v.stagger = nil
-            end
-
-            active = true
-        end
-
-        if v.barrel_roll then
-            local active_barrel_rolls = nil
-            
-            -- Process the player's barrel_roll table cooldown.
-            for j, l in pairs(v.barrel_roll) do
-                -- Find if it's aerial or not.
-                if j > 4 and l.time + barrel_roll_aerial_cooldown + server_lag < time then
-                    v.barrel_roll[j] = nil
-                elseif j < 5 and l.time + barrel_roll_cooldown + server_lag < time then
-                    v.barrel_roll[j] = nil
-                elseif l.time + barrel_roll_duration + server_lag > time then
-
-                    local yaw = player:get_look_horizontal()
-                    local co = cos(yaw)
-                    local si = sin(yaw)
-                    local x = l.x
-                    local z = l.z
-                    local re_x = co * x - si * z
-                    local re_z = si * x + co * z
-
-                    player:add_player_velocity({x = re_x, y = 0, z = re_z})
-                    active_barrel_rolls = true
-                end
-            end
-
-            if not active_barrel_rolls and player:get_properties().damage_texture_modifier == "" then
-                -- Revert the damage texture modifier.
-                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
-            end
-
-            -- Store the barrel_roll amount for later use.
-            player_persistent_data[k].active_barrel_rolls = active_barrel_rolls
-
-            -- If this table contains no more barrel_rolls remove it.
-            if maxn(v.barrel_roll) < 1 then
-                v.barrel_roll = nil
-            end
-
-            active = true
-        end
-
-        if v.dodge then
-            local active_dodges = nil
-            
-            -- Process the player's dodge table cooldown.
-            for j, l in pairs(v.dodge) do
-                -- Find if it's aerial or not.
-                if j > 4 and l + dodge_aerial_cooldown + server_lag < time then
-                    v.dodge[j] = nil
-                elseif j < 5 and l + dodge_cooldown + server_lag < time then
-                    v.dodge[j] = nil
-                elseif l + dodge_duration + server_lag > time then
-                    active_dodges = true
-                end
-            end
-
-            if not active_dodges and player:get_properties().damage_texture_modifier == "" then
-                -- Revert the damage texture modifier.
-                player:set_properties{damage_texture_modifier = player_persistent_data[k].damage_texture_modifier}
-            end
-
-            -- Store the dodge amount for later use.
-            player_persistent_data[k].active_dodges = active_dodges
-
-            -- If this table contains no more dodges remove it.
-            if maxn(v.dodge) < 1 then
-                v.dodge = nil
-            end
-
-            active = true
-        end
-
-        if v.dash then
-            -- Process the player's dash table cooldown.
-            for j, l in pairs(v.dash) do
-                -- Find if it's aerial or not.
-                if j > 4 and l + dash_aerial_cooldown + server_lag < time then
-                    v.dash[j] = nil
-                elseif j < 5 and l + dash_cooldown + server_lag < time then
-                    v.dash[j] = nil
-                end
-            end
-
-            -- If this table contains no more dashes remove it.
-            if maxn(v.dash) < 1 then
-                v.dash = nil
-            end
-
-            active = true
-        end
-
-        if v.hit then
-            local hit_data = v.hit
-            local hp = player:get_hp()
-            local hp_change
-
-            for i = #hit_data, 1, -1 do
-                local data = hit_data[i]
-
-                if data.resolved or data.time + clash_duration + server_lag < time then
-                    local block = v.block
-                    local shield = v.shield
-
-                    local damage = data.damage
-                    
-                    -- If the player was able to pull off a hasty guard cancel the attack.
-                     if damage > 0 and not (block and block.initial_time + block.hasty_guard_duration + server_lag > time) and not (shield and shield.initial_time + shield.hasty_guard_duration + server_lag > time) then
-                        hp = hp - damage
-                        hp_change = true
-                    elseif damage < 0 then
-                        local hitter = get_player_by_name(data.name)
-
-                        hitter:set_hp(hitter:get_hp() + damage)
-                    end
-
-                    local count = #hit_data
-
-                    hit_data[i] = hit_data[count]
-                    hit_data[count] = nil
-                end
-            end
-
-            if hp_change then
-                player:set_hp(hp)
-            end
-
-            -- If this table contains no more hits remove it.
-            if maxn(hit_data) < 1 then
-                v.hit = nil
-            end
-
-            active = true
-        end
-
-        if not active then
-            player_data[k] = nil
-        end
-    end
-end)
-
-if sscsm then
-    -- Register a sscsm for dodging and dashing.
-    sscsm.register({name = "pvp_revamped:movement",
-                    file = minetest.get_modpath("pvp_revamped") .. "/movement.lua"})
-
-    local function remove_hits(name)
-        local hit_data = get_player_data(name).hit
-
-        if hit_data then
-            for i = #hit_data, 1, -1 do
-                local data = hit_data[i]
-
-                if not data.resolved then
-                    local count = #hit_data
-                    
-                    hit_data[i] = hit_data[count]
-                    hit_data[count] = nil
-                end
-            end
-        end
-    end
-
-    -- Helper function to check and set the dodge cooldown.
-    local function dodge(name, player, number)
-        local dodge_data = get_player_data(name)
-        
-        if not dodge_data.dodge then
-            dodge_data.dodge = {[number] = get_us_time()}
-            player:set_properties{damage_texture_modifier = ""}
-            -- Clear out any hit data on dodge.
-            remove_hits(name)
-        elseif dodge_data.dodge and not dodge_data.dodge[number] then
-            dodge_data.dodge[number] = get_us_time()
-            player:set_properties{damage_texture_modifier = ""}
-            -- Clear out any hit data on dodge.
-            remove_hits(name)
-        end
-    end
-
-    -- Channel for dodge request.
-    sscsm.register_on_com_receive("pvp_revamped:dodge", function(name, msg)
-        if msg and type(msg) == "string" then
-            local player = get_player_by_name(name)
-            local velocity = player:get_player_velocity().y
-            local aerial_points = 0
-
-            if velocity < 0.0 or velocity > 0.0 then
-                aerial_points = 1
-            end
-
-            if msg == "dodge" then
-                dodge(name, player, 1 + aerial_points)
-            else
-                return false
-            end
-        end
-    end)
-    
-    -- Helper function to check and set the barrel_roll cooldown.
-    local function barrel_roll(name, player, number, x, z)
-        local barrel_roll_data = get_player_data(name)
-
-        if not barrel_roll_data.barrel_roll then
-            barrel_roll_data.barrel_roll = {[number] = {time = get_us_time(), x = x, z = z}}
-            player:set_properties{damage_texture_modifier = ""}
-            -- Clear out any hit data on barrel roll.
-            remove_hits(name)
-        elseif barrel_roll_data.barrel_roll and not barrel_roll_data.barrel_roll[number] then
-            barrel_roll_data.barrel_roll[number] = {time = get_us_time(), x = x, z = z}
-            player:set_properties{damage_texture_modifier = ""}
-            -- Clear out any hit data on barrel roll.
-            remove_hits(name)
-        else
-            return
-        end
-
-        local yaw = player:get_look_horizontal()
-        local co = cos(yaw)
-        local si = sin(yaw)
-        local re_x = co * x - si * z
-        local re_z = si * x + co * z
-
-        player:add_player_velocity({x = re_x, y = 0, z = re_z})
-    end
-
-    -- Channel for barrel_roll request.
-    sscsm.register_on_com_receive("pvp_revamped:barrel_roll", function(name, msg)
-        if msg and type(msg) == "string" then
-            local player = get_player_by_name(name)
-            local yaw = player:get_look_horizontal()
-            local velocity = player:get_player_velocity().y
-            local aerial_points = 0
-
-            if velocity < 0.0 or velocity > 0.0 then
-                aerial_points = 4
-            end
-
-            if msg == "barrel_roll_l" then
-                barrel_roll(name, player, 1 + aerial_points, -barrel_roll_speed, 0)
-            elseif msg == "barrel_roll_u" then
-                barrel_roll(name, player, 2 + aerial_points, 0, barrel_roll_speed)
-            elseif msg == "barrel_roll_r" then
-                barrel_roll(name, player, 3 + aerial_points, barrel_roll_speed, 0)
-            elseif msg == "barrel_roll_d" then
-                barrel_roll(name, player, 4 + aerial_points, 0, -barrel_roll_speed)
-            else
-                return false
-            end
-        end
-    end)
-
-    local function dash(player, name, dash_key, x, y, z)
-        local dash_data = get_player_data(name)
-        
-        if not dash_data.dash then
-            dash_data.dash = {[dash_key] = get_us_time()}
-        elseif dash_data.dash and not dash_data.dash[dash_key] then
-            dash_data.dash[dash_key] = get_us_time()
-        else
-            return 
-        end
-        
-        local yaw = player:get_look_horizontal()
-        local co = cos(yaw)
-        local si = sin(yaw)
-        local re_x = co * x - si * z
-        local re_z = si * x + co * z
-
-        player:add_player_velocity({x = re_x, y = y, z = re_z})
-    end
-
-    -- Channel for dash request.
-    sscsm.register_on_com_receive("pvp_revamped:dash", function(name, msg)
-        if msg and type(msg) == "string" then
-            local player = get_player_by_name(name)
-            local y = dash_speed * 0.5
-            local aerial_points = 0
-            local velocity = player:get_player_velocity().y
-
-            if velocity < 0.0 or velocity > 0.0 then
-                aerial_points = 4
-            end
-
-            if msg == "dash_l" then
-                dash(player, name, 1 + aerial_points, -dash_speed, y, 0)
-            elseif msg == "dash_u" then
-                dash(player, name, 2 + aerial_points, 0, y, dash_speed)
-            elseif msg == "dash_r" then
-                dash(player, name, 3 + aerial_points, dash_speed, y, 0)
-            elseif msg == "dash_d" then
-                dash(player, name, 4 + aerial_points, 0, y, -dash_speed)
-            else
-                return false
-            end
-        end
-    end)
-
-    -- Channel for shield_block request.
-    if minetest.global_exists("armor") then
-        sscsm.register_on_com_receive("pvp_revamped:shield_block", function(name, msg)
-            if msg and type(msg) == "string" then
-                local data_shield = player_persistent_data[name].inventory_armor_shield
-
-                if data_shield then
-                    local data = get_player_data(name)
-                    local time = get_us_time()
-
-                    data.shield = {pool = data_shield.block_pool, name = data_shield.name, index = data_shield.index, initial_time = time, time = time, duration = data_shield.duration, hasty_guard_duration = data_shield.hasty_guard_duration, armor_inv = true}
-                    data.block = nil
-                    player_data[name] = data
-
-                    get_player_by_name(name):set_properties{damage_texture_modifier = ""}
-                end
-            end
-        end)
-    end
-end
-
--- Create an empty data sheet for the player.
-minetest.register_on_joinplayer(function(player)
-    player_persistent_data[player:get_player_name()] = {damage_texture_modifier = player:get_properties().damage_texture_modifier}
-end)
-
--- Helper function to drop an item.
-local function drop(player, item, pos)
-    if not pos then
-        pos = player:get_pos()
-    end
-
-    local obj = add_item(pos, item)
-
-    if obj then
-        obj:get_luaentity().collect = true
-    end
-end
-
--- Clear up memory if the player leaves.
--- Drop any item the player is about to throw on leave.
-minetest.register_on_leaveplayer(function(player)
-    local name = player:get_player_name()
-
-    if not player_data[name] then
-        return
-    end
-
-    local throw_data = player_data[name].throw
-    
-    if throw_data then
-        drop(player, throw_data.item)
-    end
-
-    player_data[name] = nil
-    player_persistent_data[name] = nil
-end)
-
--- Drop any item the player is about to throw on death.
-minetest.register_on_dieplayer(function(player)
-    local name = player:get_player_name()
-
-    if not player_data[name] then
-        return
-    end
-
-    local throw_data = player_data[name].throw
-    
-    if throw_data then
-        drop(player, throw_data.item)
-        
-        player_data[name].throw = nil
-    end
-end)
-
--- Drop any item the player is about to throw on shutdown.
-minetest.register_on_shutdown(function()
-    for k, v in pairs(player_data) do
-        local throw_data = v.throw
-
-        if throw_data then
-            drop(player, throw_data.item)
-        end
-    end
-end)
-
-local calculate_knockback = minetest.calculate_knockback
-
---Disable knockback on stagger.
-function minetest.calculate_knockback(player, hitter, time_from_last_punch, tool_capabilities, dir, distance, damage)
-    local pdata = player_data[player:get_player_name()]
-
-    if pdata and pdata.stagger then
-        return 0.0
-    end
-    
-    return calculate_knockback(player, hitter, time_from_last_punch, tool_capabilities, dir, distance, damage)
-end
-
--- Do the damage calculations when the player gets hit.
-local function punch(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
-    local name = player:get_player_name()
-    local victim_data = get_player_data(name)
-
-    -- If the player is dodging return true.
-    if victim_data.active_barrel_rolls or victim_data.active_dodges then
-        return true
-    end
-
-    local hitter_name = hitter:get_player_name()
-    local hitter_data = get_player_data(hitter_name)
-
-    -- Cancel any attack if the hitter is in barrel_roll or dodge mode.
-    -- Or if the hitter is in the process of throwing.
-    if (hitter_data.active_barrel_rolls or hitter_data.active_dodges or hitter_data.throw) and not projectile_data then
-        return true
-    end
-
-    local pos1
-    local pos2 = player:get_pos()
-    local hitter_pos
-    local hitter_velocity
-    local item
-    local range = 4
-    local yaw = player:get_look_horizontal()
-    local front
-    local side
-    local arm
-    local leg
-    local knee
-    local re_yaw
-    local full_punch
-    local full_punch_interval = 1.4
-    local _dir
-    local projectile
-    local projectile_intersection_point
-
-    -- Use projectile_data if a thrown entity was the one that punched.
-    if projectile_data then
-        pos1 = projectile_data.pos
-        hitter_pos = {x = pos1.x, y = pos1.y, z = pos1.z}
-        item = registered_tools[projectile_data.name]
-        _dir = projectile_data.dir
-        hitter_velocity = projectile_data.velocity
-        projectile_intersection_point = projectile_data.intersection_point
-        projectile = true
-
-        -- Set the projectile table to nil.
-        projectile_data = nil
-    else
-        pos1 = hitter:get_pos()
-        hitter_pos = {x = pos1.x, y = pos1.y, z = pos1.z}
-        item = registered_tools[hitter:get_wielded_item():get_name()]
-        -- Raise the position to eye height.
-        hitter_pos.y = hitter_pos.y + hitter:get_properties().eye_height
-        _dir = hitter:get_look_dir()
-        hitter_velocity = hitter:get_player_velocity()
-    end
-
-    if item then
-        tool_capabilities = item.tool_capabilities
-    end
-
-    -- I got this rare error where tool_capabilities was nil so I put this here to safe guard.
-    if not tool_capabilities then
-        return true
-    end
-
-    if item and item.range then
-        range = item.range
-    end
-
-    -- Get whether this is a full punch.
-    if tool_capabilities and time_from_last_punch >= tool_capabilities.full_punch_interval then
-        full_punch = true
-        full_punch_interval = tool_capabilities.full_punch_interval
-    elseif tool_capabilities and tool_capabilities.full_punch_interval then
-        full_punch_interval = tool_capabilities.full_punch_interval
-    end
-
-    -- Get the second position from the direction of the hitter.
-    local hit_pos1 = add(hitter_pos, _dir)
-    local hit_pos2 = add(hit_pos1, multiply(_dir, range))
-    local ray = raycast(hit_pos1, hit_pos2)
-
-    local function hit(intersection_point)
-        local newpos = subtract(intersection_point, pos2)
-        local y1 = intersection_point.y
-        local y2 = pos2.y
-        
-        -- Get the tool's modifiers or use the default ones.
-        local head_height = tool_capabilities.head_height or head_height
-        local torso_height = tool_capabilities.torso_height or torso_height
-        local leg_height = tool_capabilities.leg_height or leg_height
-        local knee_height = tool_capabilities.knee_height or knee_height
-        local head_dmg_mul = tool_capabilities.head_dmg_mul or head_dmg_mul
-        local torso_dmg_mul = tool_capabilities.torso_dmg_mul or torso_dmg_mul
-        local arm_dmg_mul = tool_capabilities.arm_dmg_mul or arm_dmg_mul
-        local leg_dmg_mul = tool_capabilities.leg_dmg_mul or leg_dmg_mul
-
-        if head_height and head_dmg_mul and y1 > y2 + head_height then
-            -- If the player was hit in the head add extra damage.
-            damage = damage * head_dmg_mul
-        elseif torso_height and y1 > y2 + torso_height then
-            -- Find if the player was hit in the torso or arm.
-            local near_part = 0
-            local past_distance = -1
-
-            for _, point in pairs(hit_points) do
-                local x = point.x
-                local y = point.y
-                local z = point.z
-                local co = cos(yaw)
-                local si = sin(yaw)
-                local re_x = co * x - si * z
-                local re_z = si * x + co * z
-                local dist = distance(newpos, {x = re_x, y = y, z = re_z})
-                
-                if dist < past_distance or past_distance == -1 then
-                    past_distance = dist
-                    near_part = point.part
-                end
-            end
-
-            if near_part == 1 then
-                -- Hit in the arm.
-                arm = true
-
-                if arm_dmg_mul then
-                    damage = damage * arm_dmg_mul
-                end
-            elseif torso_dmg_mul then
-                -- Hit in the torso.
-                damage = damage * torso_dmg_mul
-            end
-        elseif leg_height and y1 > y2 + leg_height then
-            -- Hit in the leg.
-            leg = true
-
-            if leg_dmg_mul then
-                damage = damage * leg_dmg_mul
-            end
-        elseif knee_height and y1 > y2 + knee_height then
-            -- Hit in the knee.
-            knee = true
-
-            if leg_dmg_mul then
-                damage = damage * leg_dmg_mul
-            end
-        else
-            -- Hit in the lower leg.
-            leg = true
-
-            if leg_dmg_mul then
-                damage = damage * leg_dmg_mul
-            end
-        end
-
-        local dist = distance(hitter_pos, pos2)
-        local optimal_distance_mul = tool_capabilities.optimal_distance_mul or optimal_distance_mul
-        local dist_rounded = dist + 0.5 - (dist + 0.5) % 1
-
-        -- If the distance rounded is outside the range skip.
-        if optimal_distance_mul and dist_rounded <= range + 1 then
-            local optimal_distance_dmg_mul = tool_capabilities.optimal_distance_dmg_mul or optimal_distance_dmg_mul
-            local maximum_distance_dmg_mul = tool_capabilities.maximum_distance_dmg_mul or maximum_distance_dmg_mul
-            local optimal_range = range * optimal_distance_mul
-
-            -- Add or remove damage based on the distance.
-            -- Full punches are not affected by any maximum distance.
-            if (not full_punch or maximum_distance_dmg_mul < 0) and maximum_distance_dmg_mul and dist_rounded > optimal_range then
-                damage = damage - range * maximum_distance_dmg_mul
-            elseif (not full_punch or optimal_distance_dmg_mul > 0) and optimal_distance_dmg_mul and dist_rounded < optimal_range then
-                damage = damage + range * optimal_distance_dmg_mul
-            end
-        end
-
-        -- Get the yaw from both the player and intersection point.
-        local yaw2 = atan(newpos.z / newpos.x) + rad90
-        
-        if intersection_point.x >= pos2.x then
-            yaw2 = yaw2 + pi
-        end
-
-        re_yaw = rad360 - (yaw - yaw2)
-
-        if re_yaw < 0 then
-            re_yaw = rad360 - re_yaw
-        end
-
-        if re_yaw > rad360 then
-            re_yaw = re_yaw - rad360
-        end
-
-        local back_dmg_mul = tool_capabilities.back_dmg_mul or back_dmg_mul
-
-        if (re_yaw <= 0.7853982 and re_yaw >= 0) or (re_yaw <= 6.283185 and re_yaw >= 5.497787) then
-            -- Hit on the front.
-            front = true
-
-            local front_dmg_mul = tool_capabilities.front_dmg_mul or front_dmg_mul
-
-            if front_dmg_mul then
-                damage = damage * front_dmg_mul
-            end
-        elseif re_yaw <= 2.356194 then
-            -- Hit on the left-side.
-            side = true
-
-            local side_dmg_mul = tool_capabilities.side_dmg_mul or side_dmg_mul
-
-            if side_dmg_mul then
-                damage = damage * side_dmg_mul
-            end
-        elseif back_dmg_mul and re_yaw <= 3.926991 then
-            -- Hit on the back-side.
-            damage = damage * back_dmg_mul
-        else
-            -- Hit on the right-side.
-            side = true
-
-            local side_dmg_mul = tool_capabilities.side_dmg_mul or side_dmg_mul
-
-            if side_dmg_mul then
-                damage = damage * side_dmg_mul
-            end
-        end
-
-        -- You can only hit the knee-caps in the front.
-        if side and knee then
-            knee = nil
-            leg = true
-        end
-    end
-
-    if not projectile then
-        for pointed_thing in ray do
-            if pointed_thing.type == "object" and pointed_thing.ref:is_player() and pointed_thing.ref:get_player_name() == name then
-                hit(pointed_thing.intersection_point)
-
-                -- End the loop we got what we came for.
-                break
-            end
-        end
-    else
-        hit(projectile_intersection_point)
-    end
-
-    local elevated_dmg_mul = tool_capabilities.elevated_dmg_mul or elevated_dmg_mul
-    local lower_elevation_dmg_mul = tool_capabilities.lower_elevation_dmg_mul or lower_elevation_dmg_mul
-    local equal_height_dmg_mul = tool_capabilities.equal_height_dmg_mul or equal_height_dmg_mul
-
-    if elevated_dmg_mul and pos1.y > pos2.y then
-        -- Give a damage bonus or drawback to the aggressor if they are above the victim.
-        damage = damage * elevated_dmg_mul
-    elseif lower_elevation_dmg_mul and pos1.y < pos2.y then
-        -- Give a damage bonus or drawback to the aggressor if they are below the victim.
-        damage = damage * lower_elevation_dmg_mul
-    elseif equal_height_dmg_mul then
-        -- Give a damage bonus or drawback to the aggressor if they are equal footing with the victim.
-        damage = damage * equal_height_dmg_mul
-    end
-
-    -- This damage bonus can only be used if this is a full interval punch.
-    local velocity_dmg_mul = tool_capabilities.velocity_dmg_mul or velocity_dmg_mul
-
-    if full_punch and velocity_dmg_mul then
-        local vv
-
-        if front then
-            -- Ignore the victim's speed if you hit them in the front.
-            vv = max(abs(hitter_velocity.x), abs(hitter_velocity.y), abs(hitter_velocity.z))
-        else
-            -- Subtract the victim's velocity from the aggressor if they where not hit in the front.
-            local v2 = player:get_player_velocity()
-            vv = max(abs(hitter_velocity.x) - abs(v2.x), abs(hitter_velocity.y) - abs(v2.y), abs(hitter_velocity.z) - abs(v2.z))
-        end
-
-        if vv > 0 then
-            -- Give a damage bonus to the aggressor based on how fast they are running.
-            damage = damage + vv * velocity_dmg_mul
-        end
-    end
-
-    -- If damage is at or below zero set it to a default value.
-    damage = max(damage, 0.1)
-
-    if not projectile then
-        -- Remove the hitter's blocking data.
-        hitter_data.block = nil
-        hitter_data.shield = nil
-        player_data[hitter_name] = hitter_data
-    end
-
-    local data_throw = victim_data.throw
-    local data_block = victim_data.block
-    local hp = player:get_hp()
-    local wielded_item = player:get_wielded_item()
-    local item_name = wielded_item:get_name()
-    local block_wear_mul = tool_capabilities.block_wear_mul or block_wear_mul
-
-    -- Process if the player is blocking with a tool or not.
-    if front and not data_throw and data_block and data_block.pool > 0 and data_block.name == item_name then
-        -- Block the damage and add it as wear to the tool.
-        wielded_item:add_wear(((damage - full_punch_interval) / 75) * block_wear_mul)
-        player:set_wielded_item(wielded_item)
-        data_block.pool = data_block.pool - damage
-
-        -- Remove block table if pool is zero or below.
-        if data_block.pool <= 0 then
-            victim_data.block = nil
-            return true
-        end
-
-        victim_data.block = data_block
-
-        return true
-    end
-
-    local data_shield = victim_data.shield
-
-    -- Process if the player is blocking with a shield or not.
-    if data_shield and not data_shield.armor_inv and not data_throw and data_shield.pool > 0 and data_shield.name == item_name and (front or side) then
-        -- Block the damage and add it as wear to the tool.
-        local axe_wear = 0
-
-        if tool_capabilities and tool_capabilities.damage_groups and tool_capabilities.damage_groups.shield then
-            axe_wear = tool_capabilities.damage_groups.shield
-        end
-
-        -- Wear down the shield plus axe damage.
-        wielded_item:add_wear((((damage - full_punch_interval) / 75) * block_wear_mul) + axe_wear)
-        player:set_wielded_item(wielded_item)
-        -- pool minus damage + axe_wear.
-        data_shield.pool = data_shield.pool - (damage + axe_wear)
-
-        -- Remove shield table if pool is zero or below.
-        if data_shield.pool <= 0 then
-            victim_data.shield = nil
-            return true
-        end
-
-        victim_data.shield = data_shield
-
-        return true
-    elseif armor_3d and data_shield and data_shield.armor_inv and not data_throw and data_shield.pool > 0 and (front or side) then
-        local inv = get_inventory({type = "detached", name = name .. "_armor"})
-
-        if inv then
-            -- Block the damage and add it as wear to the tool.
-            local axe_wear = 0
-            local inventory_armor_shield = player_persistent_data[name].inventory_armor_shield
-            local index = inventory_armor_shield.index
-            local stack = inv:get_stack("armor", index)
-
-            if tool_capabilities and tool_capabilities.damage_groups and tool_capabilities.damage_groups.shield then
-                axe_wear = tool_capabilities.damage_groups.shield
-            end
-
-            if stack and stack:get_name() == inventory_armor_shield.name then
-                -- Wear down the shield plus axe damage.
-                stack:add_wear((((damage - full_punch_interval) / 75) * block_wear_mul) + axe_wear)
-                inv:set_stack("armor", index, stack)
-                -- pool minus damage + axe_wear.
-                data_shield.pool = data_shield.pool - (damage + axe_wear)
-
-                -- Remove shield table if pool is zero or below.
-                if data_shield.pool <= 0 then
-                    victim_data.shield = nil
-                    return true
-                end
-
-                victim_data.shield = data_shield
-                
-                return true
-            else
-                -- Remove the data if we either can't find the stack or the name is different.
-                player_persistent_data[name].inventory_armor_shield = nil
-            end
-        else
-            -- No inv so remove data.
-            player_persistent_data[name].inventory_armor_shield = nil
-        end
-    end
-
-    -- Process if the player was hit in the arm.
-    if arm then
-        local item2 = registered_tools[item_name]
-        local chance
-        
-        if item2 and not data_shield and not data_block and item2.tool_capabilities and item2.tool_capabilities.damage_groups.fleshy and item2.tool_capabilities.full_punch_interval then
-            -- Compute the chance to disarm by the victim's hp and tool stats.
-            local disarm_chance_mul = tool_capabilities.disarm_chance_mul or disarm_chance_mul
-
-            chance = random(0, ((hp + (item2.tool_capabilities.damage_groups.fleshy - item2.tool_capabilities.full_punch_interval) * disarm_chance_mul) - damage) + 1)
-        elseif not item2 and not data_shield and not data_block then
-            -- Compute the chance to disarm by the victim's hp.
-            chance = random(0, (hp - damage) + 1)
-        end
-
-        -- Disarm the player if chance equals zero.
-        if chance and chance <= 0 then
-            local drop_item = wielded_item:take_item()
-            local obj = add_item(pos2, drop_item)
-
-            if obj then
-                obj:get_luaentity().collect = true
-            end
-
-            player:set_wielded_item(wielded_item)
-        end
-    end
-
-    local function set_stagger_data(speed)
-        player:set_physics_override({speed = speed, jump = speed})
-
-        local stagger_mul = tool_capabilities.stagger_mul or stagger_mul
-        
-        victim_data.stagger = {time = get_us_time(), value = (1 / speed) * stagger_mul}
-    end
-
-    -- Process if the player was hit in the leg.
-    if leg then
-        -- Stagger the player.
-        local leg_stagger_mul = tool_capabilities.leg_stagger_mul or leg_stagger_mul
-        local speed = min(1 / max(damage - hp, 1) * leg_stagger_mul, 0.1)
-        local data_stagger = victim_data.stagger
-
-        if not data_stagger or data_stagger.value > speed then
-            set_stagger_data(speed)
-        end
-    elseif knee then
-        -- Stagger the player.
-        local knee_stagger_mul = tool_capabilities.knee_stagger_mul or knee_stagger_mul
-        local speed = min(1 / max(damage - hp, 1.5) * knee_stagger_mul, 0.1)
-        local data_stagger = victim_data.stagger
-
-        if data_stagger then
-            -- Add the original value and update all stagger data.
-            speed = min(abs(speed - data_stagger.value), 0.1)
-
-            set_stagger_data(speed)
-        else
-            set_stagger_data(speed)
-        end
-    end
-
-    if player:get_properties().damage_texture_modifier == "" then
-        -- Revert the damage texture modifier.
-        player:set_properties{damage_texture_modifier = player_persistent_data[name].damage_texture_modifier}
-    end
-
-    -- If there is a damage queue for the hitter tigger the clash.
-    local hitter_hitdata = hitter_data.hit
-
-    if hitter_hitdata then
-        for i = #hitter_hitdata, 1, -1 do
-            local hd = hitter_hitdata[i]
-
-            if not hd.resolved and hd.name == name then
-                if floor(hitter:get_player_control_bits() / 256) % 2 == 1 then
-                    -- Attempt to parry the attack if RMB is down.
-                    local parry_dmg_mul = tool_capabilities.parry_dmg_mul or parry_dmg_mul
-                    local clash_def_mul = tool_capabilities.clash_def_mul or 0
-                    local c_damage = damage * clash_def_mul
-                    
-                    hd.damage = max(hd.damage - (damage + c_damage) * parry_dmg_mul, 0)
-                elseif full_punch and tool_capabilities.counter_duration and hd.time + tool_capabilities.counter_duration + lag + get_player_information(hitter_name).avg_jitter * 1000000 > get_us_time() then
-                    -- All damage gets reversed on counter.
-                    -- Current damage gets added to it plus the damage multipliable.
-                    local counter_dmg_mul = tool_capabilities.counter_dmg_mul or counter_dmg_mul
-
-                    hd.damage = -(hd.damage + (damage * counter_dmg_mul))
-                else
-                    -- Reduce, remove, or reverse the damage and resolve the clash.
-                    -- Negative damage will be applied to the hitter.
-                    local clash_def_mul = tool_capabilities.clash_def_mul or 0
-                    local c_damage = damage * clash_def_mul
-
-                    hd.damage = hd.damage - damage
-
-                    if hd.damage > 0 and hd.damage - c_damage < 0 then
-                        hd.damage = 0
-                    elseif hd.damage > 0 and hd.damage - c_damage >= 0 then
-                        hd.damage = hd.damage - c_damage
-                    end
-                end
-
-                hd.resolved = true
-
-                break
-            end
-        end
-    elseif victim_data.hit then
-        insert(victim_data.hit, 1, {name = hitter_name, damage = damage, time = get_us_time()})
-    else
-        victim_data.hit = {{name = hitter_name, damage = damage, time = get_us_time()}}
-    end
-
-    victim_data.block = nil
-    victim_data.shield = nil
-
-    -- Save new player data to the table.
-    player_data[name] = victim_data
-
-    return true
-end
-
--- This needs to be the first punch function to prevent knockback on a staggered player.
-insert(minetest.registered_on_punchplayers, 1, punch)
-
-minetest.callback_origins[punch] = {
-    mod = "pvp_revamped",
-    name = "register_on_punchplayer"
-}
-
--- Cmd for changing the way you throw items.
-minetest.register_chatcommand("throw_style", {
-    params = "[<style>]: Change how you throw an item.",
-    description = "Change how you throw an item. Accepted values are [none|spin|dip]",
-    privs = {
-        interact = true,
-    },
-    func = function(name, param)
-        -- Check the given param.
-        if param == "none" then
-        -- Set the style to none.
-        player_persistent_data[name].throw_style = nil
-        
-        return true, "Throw style set to none."
-        elseif param == "spin" then
-        -- Give the item a little spin.
-        player_persistent_data[name].throw_style = projectile_throw_style_spinning
-
-        return true, "Throw style set to spin."
-        elseif param == "dip" then
-        -- Bullet drop.
-        player_persistent_data[name].throw_style = projectile_throw_style_dip
-
-        return true, "Throw style set to dip."
-        end
-
-        -- throw_style cmd help.
-        return false, "Only parameters: 'none', 'spin', and 'dip' are accepted."
-    end
-})
-
--- See if the mod armor_3d is a thing here.
-if minetest.global_exists("armor") then
-    armor_3d = true
-    -- Cmd for changing the way you block incoming damage.
-    minetest.register_chatcommand("use_shield", {
-        params = "[<boolean>]: Change how you block incoming damage.",
-        description = "If set to true, the shield plate placed in the armor inventory will be used to block all incoming damage when block key is pressed.",
-        privs = {
-            interact = true,
-        },
-        func = function(name, param)
-            -- Check the given param.
-            if param == "true" then
-                -- block key will now use the shield in the armor inv to block any incoming damage.
-                player_persistent_data[name].use_shield = true
-                
-                return true, "Shield from armor inventory will now be used to block damage."
-            elseif param == "false" then
-                -- block key will now use whatever tool selected to block any incoming damage.
-                player_persistent_data[name].use_shield = nil
-
-                return true, "Tools will now be used to block damage."
-            end
-
-            -- use_shield cmd help.
-            return false, "Only parameters: 'true', and 'false' are accepted."
-        end
-    })
-
-    local old_save_armor_inventory = armor.save_armor_inventory
-    local old_load_armor_inventory = armor.load_armor_inventory
-
-    armor.save_armor_inventory = function(self, player)
-        local _, inv = self:get_valid_player(player)
-
-        -- Create new shield inv data.
-        if inv then
-            for i, stack in pairs(inv:get_list("armor")) do
-                if stack:get_count() == 1 then
-                    local name = stack:get_name()
-                    local armor_shield = get_item_group(name, "armor_shield") or 0
-
-                    if armor_shield > 0 then
-                        local groups = stack:get_definition().groups
-
-                        player_persistent_data[player:get_player_name()].inventory_armor_shield = {name = name, index = i, block_pool = groups.block_pool, duration = groups.duration, hasty_guard_duration = groups.hasty_guard_duration}
-                        
-                        return old_save_armor_inventory(self, player)
-                    end
-                end
-            end
-        end
-
-        player_persistent_data[player:get_player_name()].inventory_armor_shield = nil
-
-        return old_save_armor_inventory(self, player)
-    end
-
-    armor.load_armor_inventory = function(self, player)
-        local _, inv = self:get_valid_player(player)
-        local results = old_load_armor_inventory(self, player)
-
-        -- Create new shield inv data.
-        if inv then
-            for i, stack in pairs(inv:get_list("armor")) do
-                if stack:get_count() == 1 then
-                    local name = stack:get_name()
-                    local armor_shield = get_item_group(name, "armor_shield") or 0
-
-                    if armor_shield > 0 then
-                        local groups = stack:get_definition().groups
-
-                        player_persistent_data[player:get_player_name()].inventory_armor_shield = {name = name, index = i, block_pool = groups.block_pool, duration = groups.duration, hasty_guard_duration = groups.hasty_guard_duration}
-                        
-                        return results
-                    end
-                end
-            end
-        end
-
-        player_persistent_data[player:get_player_name()].inventory_armor_shield = nil
-
-        return results
-    end
-end
+pvp_revamped = {}
+
+local modpath = minetest.get_modpath("pvp_revamped")
+
+dofile(string.format("%s/config.lua", modpath))
+dofile(string.format("%s/constant.lua", modpath))
+dofile(string.format("%s/globaldata.lua", modpath))
+dofile(string.format("%s/helper.lua", modpath))
+dofile(string.format("%s/entites.lua", modpath))
+dofile(string.format("%s/overrides.lua", modpath))
+dofile(string.format("%s/globalstep.lua", modpath))
+dofile(string.format("%s/sscsm.lua", modpath))
+dofile(string.format("%s/player_events.lua", modpath))
+dofile(string.format("%s/knockback.lua", modpath))
+dofile(string.format("%s/punch.lua", modpath))
+dofile(string.format("%s/chatcommands.lua", modpath))
diff --git a/knockback.lua b/knockback.lua
new file mode 100644
index 0000000..d251d89
--- /dev/null
+++ b/knockback.lua
@@ -0,0 +1,13 @@
+local player_data = pvp_revamped.player_data
+local calculate_knockback = minetest.calculate_knockback
+
+--Disable knockback on stagger.
+function minetest.calculate_knockback(player, hitter, time_from_last_punch, tool_capabilities, dir, distance, damage)
+    local pdata = player_data[player:get_player_name()]
+
+    if pdata and pdata.stagger then
+        return 0.0
+    end
+    
+    return calculate_knockback(player, hitter, time_from_last_punch, tool_capabilities, dir, distance, damage)
+end
diff --git a/overrides.lua b/overrides.lua
new file mode 100644
index 0000000..def73a9
--- /dev/null
+++ b/overrides.lua
@@ -0,0 +1,309 @@
+local projectile_full_throw_mul = pvp_revamped.config.projectile_full_throw_mul
+local projectile_speed_mul = pvp_revamped.config.projectile_speed_mul
+local shield_axe_dmg_mul = pvp_revamped.config.shield_axe_dmg_mul
+local block_pool_mul = pvp_revamped.config.block_pool_mul
+local block_interval_mul = pvp_revamped.config.block_interval_mul
+local block_duration_mul = pvp_revamped.config.block_duration_mul
+local block_duration = pvp_revamped.config.block_duration
+local hasty_guard_duration = pvp_revamped.config.hasty_guard_duration
+local hasty_guard_mul = pvp_revamped.config.hasty_guard_mul
+local hasty_shield_mul = pvp_revamped.config.hasty_shield_mul
+local shield_pool_mul = pvp_revamped.config.shield_pool_mul
+local shield_duration = pvp_revamped.config.shield_duration
+local shield_duration_mul = pvp_revamped.config.shield_duration_mul
+local block_duration = pvp_revamped.config.block_duration
+local counter_duration = pvp_revamped.config.counter_duration
+local parry_dmg_mul = pvp_revamped.config.parry_dmg_mul
+local counter_dmg_mul = pvp_revamped.config.counter_dmg_mul
+local armor_3d = pvp_revamped.armor_3d
+local get_player_data = pvp_revamped.get_player_data
+local player_data = pvp_revamped.player_data
+local player_persistent_data = pvp_revamped.player_persistent_data
+local registered_tools = minetest.registered_tools
+local get_item_group = minetest.get_item_group
+local get_us_time = minetest.get_us_time
+local max = math.max
+local floor = math.floor
+
+minetest.register_on_mods_loaded(function()
+    local max_armor_use
+
+    for k, v in pairs(registered_tools) do
+        if v.groups and v.groups.armor_use then
+            if not max_armor_use or max_armor_use < v.groups.armor_use then
+                -- Get the max armor_use.
+                max_armor_use = v.groups.armor_use
+            end
+        end
+
+        if v.tool_capabilities and v.tool_capabilities.groupcaps and v.tool_capabilities.groupcaps.choppy then
+            -- Compute the damage an axe would do to a shield.
+            local tool_capabilities = v.tool_capabilities
+            local choppy = tool_capabilities.groupcaps.choppy
+            local uxml = choppy.uses * choppy.maxlevel
+            local shield_axe_dmg_mul = tool_capabilities.shield_axe_dmg_mul or shield_axe_dmg_mul
+
+            tool_capabilities.damage_groups.shield = uxml * shield_axe_dmg_mul
+
+            minetest.override_item(k, {tool_capabilities = tool_capabilities})
+        end
+
+        if v.tool_capabilities and v.tool_capabilities.full_punch_interval then
+            -- Calculate the time it takes to fully throw an item at max velocity and damage.
+            local tool_capabilities = v.tool_capabilities
+            local projectile_full_throw_mul = tool_capabilities.projectile_full_throw_mul or projectile_full_throw_mul
+
+            tool_capabilities.full_throw = (v.tool_capabilities.full_punch_interval * projectile_full_throw_mul) * 1000000
+            
+            minetest.override_item(k, {tool_capabilities = tool_capabilities})
+        end
+
+        if v.tool_capabilities then
+            -- Calculate the item throw speed.
+            local tool_capabilities = v.tool_capabilities
+            local range = 4
+            local projectile_speed_mul = tool_capabilities.projectile_speed_mul or projectile_speed_mul
+
+            if v.tool_capabilities.range then
+                range = v.tool_capabilities.range
+            end
+
+            tool_capabilities.throw_speed = range * projectile_speed_mul
+
+            minetest.override_item(k, {tool_capabilities = tool_capabilities})
+        end
+    end
+
+    for k, v in pairs(registered_tools) do
+        if not (max_armor_use and v.groups and v.groups.armor_shield) and v.tool_capabilities and v.tool_capabilities.damage_groups.fleshy and v.tool_capabilities.full_punch_interval then
+            -- Block feature for tools with combat ability.
+            local tool_capabilities = v.tool_capabilities
+            local full_punch_interval = tool_capabilities.full_punch_interval
+            local punch_number = max(tool_capabilities.damage_groups.fleshy - full_punch_interval, 0.1)
+            local block_pool_mul = tool_capabilities.block_pool_mul or block_pool_mul
+            local block_pool = punch_number * block_pool_mul
+            local block_interval_mul = tool_capabilities.block_interval_mul or block_interval_mul
+            local full_block_interval = (full_punch_interval * block_interval_mul) * 1000000
+            local block_duration = tool_capabilities.block_duration or block_duration
+            local block_duration_mul = tool_capabilities.block_duration_mul or block_duration_mul
+            local duration = block_duration + (punch_number * block_duration_mul)
+            local old_on_secondary_use = v.on_secondary_use
+            local old_on_place = v.on_place
+            local old_on_drop = v.on_drop
+            local hasty_guard_mul = tool_capabilities.hasty_guard_mul or hasty_guard_mul
+            local hasty_guard_duration = tool_capabilities.hasty_guard_duration or hasty_guard_duration
+            
+            -- Override some custom capabilities if they are nil.
+            tool_capabilities.block_pool = tool_capabilities.block_pool or block_pool
+            tool_capabilities.duration = tool_capabilities.duration or duration
+            tool_capabilities.parry_dmg_mul = tool_capabilities.parry_dmg_mul or parry_dmg_mul
+            tool_capabilities.clash_def_mul = tool_capabilities.clash_def_mul or 0.5
+            tool_capabilities.counter_dmg_mul = tool_capabilities.counter_dmg_mul or counter_dmg_mul
+            tool_capabilities.counter_duration = tool_capabilities.counter_duration or counter_duration
+            tool_capabilities.hasty_guard_duration = tool_capabilities.hasty_guard_duration or hasty_guard_duration + punch_number * hasty_guard_mul
+            
+            if block_pool > 0 then
+                -- Allow the tool to block damage.
+                local function block_action(user)
+                    local name = user:get_player_name()
+
+                    -- Cancel if the player is throwing something.
+                    if get_player_data(name).throw then
+                        return
+                    end
+
+                    local player_pdata = player_persistent_data[name]
+                    local control_bits = user:get_player_control_bits()
+                    local time = get_us_time()
+
+                    -- Use 3d_armor inv shield if available.
+                    if armor_3d and player_pdata.inventory_armor_shield and (player_pdata.use_shield or floor(control_bits / 64) % 2 == 1) then
+                        local data_shield = player_pdata.inventory_armor_shield
+                        local data = player_data[name]
+
+                        data.shield = {pool = data_shield.block_pool, name = data_shield.name, index = data_shield.index, initial_time = time, time = time, duration = data_shield.duration, hasty_guard_duration = data_shield.hasty_guard_duration, armor_inv = true}
+                        data.block = nil
+                        player_data[name] = data
+                        
+                        user:set_properties{damage_texture_modifier = ""}
+
+                        return
+                    end
+
+                    local data = player_data[name]
+
+                    -- Prevent spam blocking.
+                    if not data.block or time - data.block.time > full_block_interval then
+                        data.block = {pool = block_pool, name = k, initial_time = time, time = time, duration = duration, hasty_guard_duration = hasty_guard_duration}
+                        data.shield = nil
+                    end
+
+                    -- Disable the damage texture modifier on tool block.
+                    user:set_properties{damage_texture_modifier = ""}
+
+                    player_data[name] = data
+                end
+
+                minetest.override_item(k, {on_secondary_use = function(itemstack, user, pointed_thing)
+                    block_action(user)
+
+                    return old_on_secondary_use(itemstack, user, pointed_thing)
+                end, on_place = function(itemstack, placer, pointed_thing)
+                    block_action(placer)
+
+                    return old_on_place(itemstack, placer, pointed_thing)
+                end, on_drop = function(itemstack, dropper, pos)
+                    local name = itemstack:get_name()
+                    local player_name = dropper:get_player_name()
+                    local control_bits = dropper:get_player_control_bits()
+                    local throw_data = get_player_data(player_name).throw
+
+                    -- If in the process of throwing, either LMB, RMB, or item name is not the same then return the old function.
+                    if throw_data or dropper:get_wielded_item():get_name() ~= name or (floor(control_bits / 128) % 2 ~= 1 and floor(control_bits / 256) % 2 ~= 1) then 
+                        return old_on_drop(itemstack, dropper, pos)
+                    end
+
+                    throw_data = {name = name, time = get_us_time(), item = itemstack:take_item(), tool_capabilities = registered_tools[name].tool_capabilities}
+                    player_data[player_name].throw = throw_data
+
+                    return itemstack
+                end, tool_capabilities = tool_capabilities})
+            end
+        elseif max_armor_use and v.groups and v.groups.armor_shield then
+            -- Block feature for shields.
+            local groups = v.groups
+            local armor_heal = groups.armor_heal or 0
+            local armor_use = groups.armor_use or 0
+            local armor_shield = groups.armor_shield or 1
+            local old_on_secondary_use = v.on_secondary_use
+            local old_on_place = v.on_place
+            local fleshy = 1
+            
+            if v.armor_groups and v.armor_groups.fleshy then
+                fleshy = v.armor_groups.fleshy
+            end
+            
+            local value = armor_heal + armor_shield + fleshy
+            local shield_pool_mul = groups.shield_pool_mul or shield_pool_mul
+            local block_pool = max_armor_use - armor_use + value * shield_pool_mul
+            local shield_duration = groups.shield_duration or shield_duration
+            local duration = shield_duration + (armor_use + value) * shield_duration_mul
+            local hasty_shield_mul = groups.hasty_shield_mul or hasty_shield_mul
+
+            -- Write new capabilities if they are nil.
+            groups.block_pool = groups.block_pool or block_pool
+            groups.duration = groups.duration or duration
+            groups.hasty_guard_duration = groups.hasty_guard_duration or hasty_guard_duration
+            groups.hasty_guard_duration = groups.hasty_guard_duration + value * hasty_shield_mul
+
+            if block_pool > 0 then
+                -- Allow the shield to block damage.
+                local function block_action(user)
+                    local name = user:get_player_name()
+
+                    -- Cancel if the player is throwing something.
+                    if get_player_data(name).throw then
+                        return
+                    end
+
+                    local player_pdata = player_persistent_data[name]
+                    local control_bits = user:get_player_control_bits()
+                    local time = get_us_time()
+
+                    -- Use 3d_armor inv shield if available.
+                    if armor_3d and player_pdata.inventory_armor_shield and (player_pdata.use_shield or floor(control_bits / 64) % 2 == 1) then
+                        local data_shield = player_pdata.inventory_armor_shield
+                        local data = player_data[name]
+
+                        data.shield = {pool = data_shield.block_pool, name = data_shield.name, index = data_shield.index, initial_time = time, time = time, duration = data_shield.duration, hasty_guard_duration = data_shield.hasty_guard_duration, armor_inv = true}
+                        data.block = nil
+                        player_data[name] = data
+                        
+                        user:set_properties{damage_texture_modifier = ""}
+
+                        return
+                    end
+
+                    local data = player_data[name]
+
+                    data.shield = {pool = block_pool, name = k, initial_time = time, time = time, duration = duration, hasty_guard_duration = hasty_guard_duration}
+                    data.block = nil
+
+                    player_data[name] = data
+
+                    -- Disable the damage texture modifier on shield block.
+                    user:set_properties{damage_texture_modifier = ""}
+                end
+
+                minetest.override_item(k, {on_secondary_use = function(itemstack, user, pointed_thing)
+                    block_action(user)
+
+                    return old_on_secondary_use(itemstack, user, pointed_thing)
+                end, on_place = function(itemstack, placer, pointed_thing)
+                    block_action(placer)
+
+                    return old_on_place(itemstack, placer, pointed_thing)
+                end, groups = groups})
+            end
+        end
+    end
+end)
+
+-- See if the mod armor_3d is a thing here.
+if minetest.global_exists("armor") then
+    local old_save_armor_inventory = armor.save_armor_inventory
+    local old_load_armor_inventory = armor.load_armor_inventory
+
+    armor.save_armor_inventory = function(self, player)
+        local _, inv = self:get_valid_player(player)
+
+        -- Create new shield inv data.
+        if inv then
+            for i, stack in pairs(inv:get_list("armor")) do
+                if stack:get_count() == 1 then
+                    local name = stack:get_name()
+                    local armor_shield = get_item_group(name, "armor_shield") or 0
+
+                    if armor_shield > 0 then
+                        local groups = stack:get_definition().groups
+
+                        player_persistent_data[player:get_player_name()].inventory_armor_shield = {name = name, index = i, block_pool = groups.block_pool, duration = groups.duration, hasty_guard_duration = groups.hasty_guard_duration}
+                        
+                        return old_save_armor_inventory(self, player)
+                    end
+                end
+            end
+        end
+
+        player_persistent_data[player:get_player_name()].inventory_armor_shield = nil
+
+        return old_save_armor_inventory(self, player)
+    end
+
+    armor.load_armor_inventory = function(self, player)
+        local _, inv = self:get_valid_player(player)
+        local results = old_load_armor_inventory(self, player)
+
+        -- Create new shield inv data.
+        if inv then
+            for i, stack in pairs(inv:get_list("armor")) do
+                if stack:get_count() == 1 then
+                    local name = stack:get_name()
+                    local armor_shield = get_item_group(name, "armor_shield") or 0
+
+                    if armor_shield > 0 then
+                        local groups = stack:get_definition().groups
+
+                        player_persistent_data[player:get_player_name()].inventory_armor_shield = {name = name, index = i, block_pool = groups.block_pool, duration = groups.duration, hasty_guard_duration = groups.hasty_guard_duration}
+                        
+                        return results
+                    end
+                end
+            end
+        end
+
+        player_persistent_data[player:get_player_name()].inventory_armor_shield = nil
+
+        return results
+    end
+end
diff --git a/player_events.lua b/player_events.lua
new file mode 100644
index 0000000..3266ee1
--- /dev/null
+++ b/player_events.lua
@@ -0,0 +1,55 @@
+local player_data = pvp_revamped.player_data
+local player_persistent_data = pvp_revamped.player_persistent_data
+local drop = pvp_revamped.drop
+
+-- Create an empty data sheet for the player.
+minetest.register_on_joinplayer(function(player)
+    player_persistent_data[player:get_player_name()] = {damage_texture_modifier = player:get_properties().damage_texture_modifier}
+end)
+
+-- Clear up memory if the player leaves.
+-- Drop any item the player is about to throw on leave.
+minetest.register_on_leaveplayer(function(player)
+    local name = player:get_player_name()
+
+    if not player_data[name] then
+        return
+    end
+
+    local throw_data = player_data[name].throw
+    
+    if throw_data then
+        drop(player, throw_data.item)
+    end
+
+    player_data[name] = nil
+    player_persistent_data[name] = nil
+end)
+
+-- Drop any item the player is about to throw on death.
+minetest.register_on_dieplayer(function(player)
+    local name = player:get_player_name()
+
+    if not player_data[name] then
+        return
+    end
+
+    local throw_data = player_data[name].throw
+    
+    if throw_data then
+        drop(player, throw_data.item)
+        
+        player_data[name].throw = nil
+    end
+end)
+
+-- Drop any item the player is about to throw on shutdown.
+minetest.register_on_shutdown(function()
+    for k, v in pairs(player_data) do
+        local throw_data = v.throw
+
+        if throw_data then
+            drop(player, throw_data.item)
+        end
+    end
+end)
diff --git a/punch.lua b/punch.lua
new file mode 100644
index 0000000..5471663
--- /dev/null
+++ b/punch.lua
@@ -0,0 +1,572 @@
+local head_height = pvp_revamped.config.head_height
+local torso_height = pvp_revamped.config.torso_height
+local leg_height = pvp_revamped.config.leg_height
+local knee_height = pvp_revamped.config.knee_height
+local disarm_chance_mul = pvp_revamped.config.disarm_chance_mul
+local leg_stagger_mul = pvp_revamped.config.leg_stagger_mul
+local knee_stagger_mul = pvp_revamped.config.knee_stagger_mul
+local stagger_mul = pvp_revamped.config.stagger_mul
+local block_wear_mul = pvp_revamped.config.block_wear_mul
+local head_dmg_mul = pvp_revamped.config.head_dmg_mul
+local torso_dmg_mul = pvp_revamped.config.torso_dmg_mul
+local arm_dmg_mul = pvp_revamped.config.arm_dmg_mul
+local leg_dmg_mul = pvp_revamped.config.leg_dmg_mul
+local front_dmg_mul = pvp_revamped.config.front_dmg_mul
+local side_dmg_mul = pvp_revamped.config.side_dmg_mul
+local back_dmg_mul = pvp_revamped.config.back_dmg_mul
+local elevated_dmg_mul = pvp_revamped.config.elevated_dmg_mul
+local equal_height_dmg_mul = pvp_revamped.config.equal_height_dmg_mul
+local lower_elevation_dmg_mul = pvp_revamped.config.lower_elevation_dmg_mul
+local velocity_dmg_mul = pvp_revamped.config.velocity_dmg_mul
+local optimal_distance_dmg_mul = pvp_revamped.config.optimal_distance_dmg_mul
+local maximum_distance_dmg_mul = pvp_revamped.config.maximum_distance_dmg_mul
+local optimal_distance_mul = pvp_revamped.config.optimal_distance_mul
+local parry_dmg_mul = pvp_revamped.config.parry_dmg_mul
+local counter_dmg_mul = pvp_revamped.config.counter_dmg_mul
+local counter_duration = pvp_revamped.config.counter_duration
+local get_player_data = pvp_revamped.get_player_data
+local player_data = pvp_revamped.player_data
+local projectile_data = pvp_revamped.projectile_data
+local player_persistent_data = pvp_revamped.player_persistent_data
+local armor_3d = pvp_revamped.armor_3d
+local lag = pvp_revamped.lag
+local hit_points = pvp_revamped.hit_points
+local registered_tools = minetest.registered_tools
+local raycast = minetest.raycast
+local get_us_time = minetest.get_us_time
+local get_player_information = minetest.get_player_information
+local add_item = minetest.add_item
+local get_inventory = minetest.get_inventory
+local insert = table.insert
+local add = vector.add
+local multiply = vector.multiply
+local subtract = vector.subtract
+local distance = vector.distance
+local cos = math.cos
+local sin = math.sin
+local abs = math.abs
+local atan = math.atan
+local random = math.random
+local max = math.max
+local min = math.min
+local floor = math.floor
+local pi = math.pi
+local rad90 = pi * 0.5
+local rad360 = pi * 2
+
+-- Do the damage calculations when the player gets hit.
+local function punch(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
+    local name = player:get_player_name()
+    local victim_data = get_player_data(name)
+
+    -- If the player is dodging return true.
+    if victim_data.active_barrel_rolls or victim_data.active_dodges then
+        return true
+    end
+
+    local hitter_name = hitter:get_player_name()
+    local hitter_data = get_player_data(hitter_name)
+
+    -- Cancel any attack if the hitter is in barrel_roll or dodge mode.
+    -- Or if the hitter is in the process of throwing.
+    if (hitter_data.active_barrel_rolls or hitter_data.active_dodges or hitter_data.throw) and not projectile_data then
+        return true
+    end
+
+    local pos1
+    local pos2 = player:get_pos()
+    local hitter_pos
+    local hitter_velocity
+    local item
+    local range = 4
+    local yaw = player:get_look_horizontal()
+    local front
+    local side
+    local arm
+    local leg
+    local knee
+    local re_yaw
+    local full_punch
+    local full_punch_interval = 1.4
+    local _dir
+    local projectile
+    local projectile_intersection_point
+
+    -- Use projectile_data if a thrown entity was the one that punched.
+    if projectile_data then
+        pos1 = projectile_data.pos
+        hitter_pos = {x = pos1.x, y = pos1.y, z = pos1.z}
+        item = registered_tools[projectile_data.name]
+        _dir = projectile_data.dir
+        hitter_velocity = projectile_data.velocity
+        projectile_intersection_point = projectile_data.intersection_point
+        projectile = true
+
+        -- Set the projectile table to nil.
+        projectile_data = nil
+    else
+        pos1 = hitter:get_pos()
+        hitter_pos = {x = pos1.x, y = pos1.y, z = pos1.z}
+        item = registered_tools[hitter:get_wielded_item():get_name()]
+        -- Raise the position to eye height.
+        hitter_pos.y = hitter_pos.y + hitter:get_properties().eye_height
+        _dir = hitter:get_look_dir()
+        hitter_velocity = hitter:get_player_velocity()
+    end
+
+    if item then
+        tool_capabilities = item.tool_capabilities
+    end
+
+    -- I got this rare error where tool_capabilities was nil so I put this here to safe guard.
+    if not tool_capabilities then
+        return true
+    end
+
+    if item and item.range then
+        range = item.range
+    end
+
+    -- Get whether this is a full punch.
+    if tool_capabilities and time_from_last_punch >= tool_capabilities.full_punch_interval then
+        full_punch = true
+        full_punch_interval = tool_capabilities.full_punch_interval
+    elseif tool_capabilities and tool_capabilities.full_punch_interval then
+        full_punch_interval = tool_capabilities.full_punch_interval
+    end
+
+    -- Get the second position from the direction of the hitter.
+    local hit_pos1 = add(hitter_pos, _dir)
+    local hit_pos2 = add(hit_pos1, multiply(_dir, range))
+    local ray = raycast(hit_pos1, hit_pos2)
+
+    local function hit(intersection_point)
+        local newpos = subtract(intersection_point, pos2)
+        local y1 = intersection_point.y
+        local y2 = pos2.y
+        
+        -- Get the tool's modifiers or use the default ones.
+        local head_height = tool_capabilities.head_height or head_height
+        local torso_height = tool_capabilities.torso_height or torso_height
+        local leg_height = tool_capabilities.leg_height or leg_height
+        local knee_height = tool_capabilities.knee_height or knee_height
+        local head_dmg_mul = tool_capabilities.head_dmg_mul or head_dmg_mul
+        local torso_dmg_mul = tool_capabilities.torso_dmg_mul or torso_dmg_mul
+        local arm_dmg_mul = tool_capabilities.arm_dmg_mul or arm_dmg_mul
+        local leg_dmg_mul = tool_capabilities.leg_dmg_mul or leg_dmg_mul
+
+        if head_height and head_dmg_mul and y1 > y2 + head_height then
+            -- If the player was hit in the head add extra damage.
+            damage = damage * head_dmg_mul
+        elseif torso_height and y1 > y2 + torso_height then
+            -- Find if the player was hit in the torso or arm.
+            local near_part = 0
+            local past_distance = -1
+
+            for _, point in pairs(hit_points) do
+                local x = point.x
+                local y = point.y
+                local z = point.z
+                local co = cos(yaw)
+                local si = sin(yaw)
+                local re_x = co * x - si * z
+                local re_z = si * x + co * z
+                local dist = distance(newpos, {x = re_x, y = y, z = re_z})
+                
+                if dist < past_distance or past_distance == -1 then
+                    past_distance = dist
+                    near_part = point.part
+                end
+            end
+
+            if near_part == 1 then
+                -- Hit in the arm.
+                arm = true
+
+                if arm_dmg_mul then
+                    damage = damage * arm_dmg_mul
+                end
+            elseif torso_dmg_mul then
+                -- Hit in the torso.
+                damage = damage * torso_dmg_mul
+            end
+        elseif leg_height and y1 > y2 + leg_height then
+            -- Hit in the leg.
+            leg = true
+
+            if leg_dmg_mul then
+                damage = damage * leg_dmg_mul
+            end
+        elseif knee_height and y1 > y2 + knee_height then
+            -- Hit in the knee.
+            knee = true
+
+            if leg_dmg_mul then
+                damage = damage * leg_dmg_mul
+            end
+        else
+            -- Hit in the lower leg.
+            leg = true
+
+            if leg_dmg_mul then
+                damage = damage * leg_dmg_mul
+            end
+        end
+
+        local dist = distance(hitter_pos, pos2)
+        local optimal_distance_mul = tool_capabilities.optimal_distance_mul or optimal_distance_mul
+        local dist_rounded = dist + 0.5 - (dist + 0.5) % 1
+
+        -- If the distance rounded is outside the range skip.
+        if optimal_distance_mul and dist_rounded <= range + 1 then
+            local optimal_distance_dmg_mul = tool_capabilities.optimal_distance_dmg_mul or optimal_distance_dmg_mul
+            local maximum_distance_dmg_mul = tool_capabilities.maximum_distance_dmg_mul or maximum_distance_dmg_mul
+            local optimal_range = range * optimal_distance_mul
+
+            -- Add or remove damage based on the distance.
+            -- Full punches are not affected by any maximum distance.
+            if (not full_punch or maximum_distance_dmg_mul < 0) and maximum_distance_dmg_mul and dist_rounded > optimal_range then
+                damage = damage - range * maximum_distance_dmg_mul
+            elseif (not full_punch or optimal_distance_dmg_mul > 0) and optimal_distance_dmg_mul and dist_rounded < optimal_range then
+                damage = damage + range * optimal_distance_dmg_mul
+            end
+        end
+
+        -- Get the yaw from both the player and intersection point.
+        local yaw2 = atan(newpos.z / newpos.x) + rad90
+        
+        if intersection_point.x >= pos2.x then
+            yaw2 = yaw2 + pi
+        end
+
+        re_yaw = rad360 - (yaw - yaw2)
+
+        if re_yaw < 0 then
+            re_yaw = rad360 - re_yaw
+        end
+
+        if re_yaw > rad360 then
+            re_yaw = re_yaw - rad360
+        end
+
+        local back_dmg_mul = tool_capabilities.back_dmg_mul or back_dmg_mul
+
+        if (re_yaw <= 0.7853982 and re_yaw >= 0) or (re_yaw <= 6.283185 and re_yaw >= 5.497787) then
+            -- Hit on the front.
+            front = true
+
+            local front_dmg_mul = tool_capabilities.front_dmg_mul or front_dmg_mul
+
+            if front_dmg_mul then
+                damage = damage * front_dmg_mul
+            end
+        elseif re_yaw <= 2.356194 then
+            -- Hit on the left-side.
+            side = true
+
+            local side_dmg_mul = tool_capabilities.side_dmg_mul or side_dmg_mul
+
+            if side_dmg_mul then
+                damage = damage * side_dmg_mul
+            end
+        elseif back_dmg_mul and re_yaw <= 3.926991 then
+            -- Hit on the back-side.
+            damage = damage * back_dmg_mul
+        else
+            -- Hit on the right-side.
+            side = true
+
+            local side_dmg_mul = tool_capabilities.side_dmg_mul or side_dmg_mul
+
+            if side_dmg_mul then
+                damage = damage * side_dmg_mul
+            end
+        end
+
+        -- You can only hit the knee-caps in the front.
+        if side and knee then
+            knee = nil
+            leg = true
+        end
+    end
+
+    if not projectile then
+        for pointed_thing in ray do
+            if pointed_thing.type == "object" and pointed_thing.ref:is_player() and pointed_thing.ref:get_player_name() == name then
+                hit(pointed_thing.intersection_point)
+
+                -- End the loop we got what we came for.
+                break
+            end
+        end
+    else
+        hit(projectile_intersection_point)
+    end
+
+    local elevated_dmg_mul = tool_capabilities.elevated_dmg_mul or elevated_dmg_mul
+    local lower_elevation_dmg_mul = tool_capabilities.lower_elevation_dmg_mul or lower_elevation_dmg_mul
+    local equal_height_dmg_mul = tool_capabilities.equal_height_dmg_mul or equal_height_dmg_mul
+
+    if elevated_dmg_mul and pos1.y > pos2.y then
+        -- Give a damage bonus or drawback to the aggressor if they are above the victim.
+        damage = damage * elevated_dmg_mul
+    elseif lower_elevation_dmg_mul and pos1.y < pos2.y then
+        -- Give a damage bonus or drawback to the aggressor if they are below the victim.
+        damage = damage * lower_elevation_dmg_mul
+    elseif equal_height_dmg_mul then
+        -- Give a damage bonus or drawback to the aggressor if they are equal footing with the victim.
+        damage = damage * equal_height_dmg_mul
+    end
+
+    -- This damage bonus can only be used if this is a full interval punch.
+    local velocity_dmg_mul = tool_capabilities.velocity_dmg_mul or velocity_dmg_mul
+
+    if full_punch and velocity_dmg_mul then
+        local vv
+
+        if front then
+            -- Ignore the victim's speed if you hit them in the front.
+            vv = max(abs(hitter_velocity.x), abs(hitter_velocity.y), abs(hitter_velocity.z))
+        else
+            -- Subtract the victim's velocity from the aggressor if they where not hit in the front.
+            local v2 = player:get_player_velocity()
+            vv = max(abs(hitter_velocity.x) - abs(v2.x), abs(hitter_velocity.y) - abs(v2.y), abs(hitter_velocity.z) - abs(v2.z))
+        end
+
+        if vv > 0 then
+            -- Give a damage bonus to the aggressor based on how fast they are running.
+            damage = damage + vv * velocity_dmg_mul
+        end
+    end
+
+    -- If damage is at or below zero set it to a default value.
+    damage = max(damage, 0.1)
+
+    if not projectile then
+        -- Remove the hitter's blocking data.
+        hitter_data.block = nil
+        hitter_data.shield = nil
+        player_data[hitter_name] = hitter_data
+    end
+
+    local data_throw = victim_data.throw
+    local data_block = victim_data.block
+    local hp = player:get_hp()
+    local wielded_item = player:get_wielded_item()
+    local item_name = wielded_item:get_name()
+    local block_wear_mul = tool_capabilities.block_wear_mul or block_wear_mul
+
+    -- Process if the player is blocking with a tool or not.
+    if front and not data_throw and data_block and data_block.pool > 0 and data_block.name == item_name then
+        -- Block the damage and add it as wear to the tool.
+        wielded_item:add_wear(((damage - full_punch_interval) / 75) * block_wear_mul)
+        player:set_wielded_item(wielded_item)
+        data_block.pool = data_block.pool - damage
+
+        -- Remove block table if pool is zero or below.
+        if data_block.pool <= 0 then
+            victim_data.block = nil
+            return true
+        end
+
+        victim_data.block = data_block
+
+        return true
+    end
+
+    local data_shield = victim_data.shield
+
+    -- Process if the player is blocking with a shield or not.
+    if data_shield and not data_shield.armor_inv and not data_throw and data_shield.pool > 0 and data_shield.name == item_name and (front or side) then
+        -- Block the damage and add it as wear to the tool.
+        local axe_wear = 0
+
+        if tool_capabilities and tool_capabilities.damage_groups and tool_capabilities.damage_groups.shield then
+            axe_wear = tool_capabilities.damage_groups.shield
+        end
+
+        -- Wear down the shield plus axe damage.
+        wielded_item:add_wear((((damage - full_punch_interval) / 75) * block_wear_mul) + axe_wear)
+        player:set_wielded_item(wielded_item)
+        -- pool minus damage + axe_wear.
+        data_shield.pool = data_shield.pool - (damage + axe_wear)
+
+        -- Remove shield table if pool is zero or below.
+        if data_shield.pool <= 0 then
+            victim_data.shield = nil
+            return true
+        end
+
+        victim_data.shield = data_shield
+
+        return true
+    elseif armor_3d and data_shield and data_shield.armor_inv and not data_throw and data_shield.pool > 0 and (front or side) then
+        local inv = get_inventory({type = "detached", name = name .. "_armor"})
+
+        if inv then
+            -- Block the damage and add it as wear to the tool.
+            local axe_wear = 0
+            local inventory_armor_shield = player_persistent_data[name].inventory_armor_shield
+            local index = inventory_armor_shield.index
+            local stack = inv:get_stack("armor", index)
+
+            if tool_capabilities and tool_capabilities.damage_groups and tool_capabilities.damage_groups.shield then
+                axe_wear = tool_capabilities.damage_groups.shield
+            end
+
+            if stack and stack:get_name() == inventory_armor_shield.name then
+                -- Wear down the shield plus axe damage.
+                stack:add_wear((((damage - full_punch_interval) / 75) * block_wear_mul) + axe_wear)
+                inv:set_stack("armor", index, stack)
+                -- pool minus damage + axe_wear.
+                data_shield.pool = data_shield.pool - (damage + axe_wear)
+
+                -- Remove shield table if pool is zero or below.
+                if data_shield.pool <= 0 then
+                    victim_data.shield = nil
+                    return true
+                end
+
+                victim_data.shield = data_shield
+                
+                return true
+            else
+                -- Remove the data if we either can't find the stack or the name is different.
+                player_persistent_data[name].inventory_armor_shield = nil
+            end
+        else
+            -- No inv so remove data.
+            player_persistent_data[name].inventory_armor_shield = nil
+        end
+    end
+
+    -- Process if the player was hit in the arm.
+    if arm then
+        local item2 = registered_tools[item_name]
+        local chance
+        
+        if item2 and not data_shield and not data_block and item2.tool_capabilities and item2.tool_capabilities.damage_groups.fleshy and item2.tool_capabilities.full_punch_interval then
+            -- Compute the chance to disarm by the victim's hp and tool stats.
+            local disarm_chance_mul = tool_capabilities.disarm_chance_mul or disarm_chance_mul
+
+            chance = random(0, ((hp + (item2.tool_capabilities.damage_groups.fleshy - item2.tool_capabilities.full_punch_interval) * disarm_chance_mul) - damage) + 1)
+        elseif not item2 and not data_shield and not data_block then
+            -- Compute the chance to disarm by the victim's hp.
+            chance = random(0, (hp - damage) + 1)
+        end
+
+        -- Disarm the player if chance equals zero.
+        if chance and chance <= 0 then
+            local drop_item = wielded_item:take_item()
+            local obj = add_item(pos2, drop_item)
+
+            if obj then
+                obj:get_luaentity().collect = true
+            end
+
+            player:set_wielded_item(wielded_item)
+        end
+    end
+
+    local function set_stagger_data(speed)
+        player:set_physics_override({speed = speed, jump = speed})
+
+        local stagger_mul = tool_capabilities.stagger_mul or stagger_mul
+        
+        victim_data.stagger = {time = get_us_time(), value = (1 / speed) * stagger_mul}
+    end
+
+    -- Process if the player was hit in the leg.
+    if leg then
+        -- Stagger the player.
+        local leg_stagger_mul = tool_capabilities.leg_stagger_mul or leg_stagger_mul
+        local speed = min(1 / max(damage - hp, 1) * leg_stagger_mul, 0.1)
+        local data_stagger = victim_data.stagger
+
+        if not data_stagger or data_stagger.value > speed then
+            set_stagger_data(speed)
+        end
+    elseif knee then
+        -- Stagger the player.
+        local knee_stagger_mul = tool_capabilities.knee_stagger_mul or knee_stagger_mul
+        local speed = min(1 / max(damage - hp, 1.5) * knee_stagger_mul, 0.1)
+        local data_stagger = victim_data.stagger
+
+        if data_stagger then
+            -- Add the original value and update all stagger data.
+            speed = min(abs(speed - data_stagger.value), 0.1)
+
+            set_stagger_data(speed)
+        else
+            set_stagger_data(speed)
+        end
+    end
+
+    if player:get_properties().damage_texture_modifier == "" then
+        -- Revert the damage texture modifier.
+        player:set_properties{damage_texture_modifier = player_persistent_data[name].damage_texture_modifier}
+    end
+
+    -- If there is a damage queue for the hitter tigger the clash.
+    local hitter_hitdata = hitter_data.hit
+
+    if hitter_hitdata then
+        for i = #hitter_hitdata, 1, -1 do
+            local hd = hitter_hitdata[i]
+
+            if not hd.resolved and hd.name == name then
+                if floor(hitter:get_player_control_bits() / 256) % 2 == 1 then
+                    -- Attempt to parry the attack if RMB is down.
+                    local parry_dmg_mul = tool_capabilities.parry_dmg_mul or parry_dmg_mul
+                    local clash_def_mul = tool_capabilities.clash_def_mul or 0
+                    local c_damage = damage * clash_def_mul
+                    
+                    hd.damage = max(hd.damage - (damage + c_damage) * parry_dmg_mul, 0)
+                elseif full_punch and tool_capabilities.counter_duration and hd.time + tool_capabilities.counter_duration + lag + get_player_information(hitter_name).avg_jitter * 1000000 > get_us_time() then
+                    -- All damage gets reversed on counter.
+                    -- Current damage gets added to it plus the damage multipliable.
+                    local counter_dmg_mul = tool_capabilities.counter_dmg_mul or counter_dmg_mul
+
+                    hd.damage = -(hd.damage + (damage * counter_dmg_mul))
+                else
+                    -- Reduce, remove, or reverse the damage and resolve the clash.
+                    -- Negative damage will be applied to the hitter.
+                    local clash_def_mul = tool_capabilities.clash_def_mul or 0
+                    local c_damage = damage * clash_def_mul
+
+                    hd.damage = hd.damage - damage
+
+                    if hd.damage > 0 and hd.damage - c_damage < 0 then
+                        hd.damage = 0
+                    elseif hd.damage > 0 and hd.damage - c_damage >= 0 then
+                        hd.damage = hd.damage - c_damage
+                    end
+                end
+
+                hd.resolved = true
+
+                break
+            end
+        end
+    elseif victim_data.hit then
+        insert(victim_data.hit, 1, {name = hitter_name, damage = damage, time = get_us_time()})
+    else
+        victim_data.hit = {{name = hitter_name, damage = damage, time = get_us_time()}}
+    end
+
+    victim_data.block = nil
+    victim_data.shield = nil
+
+    -- Save new player data to the table.
+    player_data[name] = victim_data
+
+    return true
+end
+
+-- This needs to be the first punch function to prevent knockback on a staggered player.
+insert(minetest.registered_on_punchplayers, 1, punch)
+
+minetest.callback_origins[punch] = {
+    mod = "pvp_revamped",
+    name = "register_on_punchplayer"
+}
diff --git a/settingtypes.txt b/settingtypes.txt
index bcb42c6..39df190 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -54,7 +54,7 @@ pvp_revamped.arm_dmg_mul (Arm damage multiplier) float 0.6
 # Damage multiplier for leg shots.
 pvp_revamped.leg_dmg_mul (Leg damage multiplier) float 0.7
 # Damage multiplier for punching a player facing you.
-pvp_revamped.front_dmg_mul (Front damage multiplier) float nil
+pvp_revamped.front_dmg_mul (Front damage multiplier) float 1
 # Damage multiplier for punching a player on any side.
 pvp_revamped.side_dmg_mul (Side damage multiplier) float 1.05
 # Damage multiplier for punching a player on the back.
@@ -62,7 +62,7 @@ pvp_revamped.back_dmg_mul (Back damage multiplier) float 1.1
 # Damage multiplier for being above the victim's y position.
 pvp_revamped.elevated_dmg_mul (Elevated damage multiplier) float 1.5
 # Damage multiplier for having equal y position.
-pvp_revamped.equal_height_dmg_mul (Equal height damage multiplier) float nil
+pvp_revamped.equal_height_dmg_mul (Equal height damage multiplier) float 1
 # Damage multiplier for being below the victim's y position.
 pvp_revamped.lower_elevation_dmg_mul (Lower elevation damage multiplier) float 0.9
 # Damage multiplier for how fast the hitter is moving.
diff --git a/sscsm.lua b/sscsm.lua
new file mode 100644
index 0000000..109ab1e
--- /dev/null
+++ b/sscsm.lua
@@ -0,0 +1,187 @@
+if sscsm then
+    local get_player_data = pvp_revamped.get_player_data
+    local player_data = pvp_revamped.player_data
+    local player_persistent_data = pvp_revamped.player_persistent_data
+    local get_us_time = minetest.get_us_time
+    local get_player_by_name = minetest.get_player_by_name
+    local dash_speed = pvp_revamped.config.dash_speed
+    local barrel_roll_speed = pvp_revamped.config.barrel_roll_speed
+    local cos = math.cos
+    local sin = math.sin
+
+    -- Register a sscsm for dodging and dashing.
+    sscsm.register({name = "pvp_revamped:movement",
+                    file = minetest.get_modpath("pvp_revamped") .. "/movement.lua"})
+
+    local function remove_hits(name)
+        local hit_data = get_player_data(name).hit
+
+        if hit_data then
+            for i = #hit_data, 1, -1 do
+                local data = hit_data[i]
+
+                if not data.resolved then
+                    local count = #hit_data
+                    
+                    hit_data[i] = hit_data[count]
+                    hit_data[count] = nil
+                end
+            end
+        end
+    end
+
+    -- Helper function to check and set the dodge cooldown.
+    local function dodge(name, player, number)
+        local dodge_data = get_player_data(name)
+        
+        if not dodge_data.dodge then
+            dodge_data.dodge = {[number] = get_us_time()}
+            player:set_properties{damage_texture_modifier = ""}
+            -- Clear out any hit data on dodge.
+            remove_hits(name)
+        elseif dodge_data.dodge and not dodge_data.dodge[number] then
+            dodge_data.dodge[number] = get_us_time()
+            player:set_properties{damage_texture_modifier = ""}
+            -- Clear out any hit data on dodge.
+            remove_hits(name)
+        end
+    end
+
+    -- Channel for dodge request.
+    sscsm.register_on_com_receive("pvp_revamped:dodge", function(name, msg)
+        if msg and type(msg) == "string" then
+            local player = get_player_by_name(name)
+            local velocity = player:get_player_velocity().y
+            local aerial_points = 0
+
+            if velocity < 0.0 or velocity > 0.0 then
+                aerial_points = 1
+            end
+
+            if msg == "dodge" then
+                dodge(name, player, 1 + aerial_points)
+            else
+                return false
+            end
+        end
+    end)
+    
+    -- Helper function to check and set the barrel_roll cooldown.
+    local function barrel_roll(name, player, number, x, z)
+        local barrel_roll_data = get_player_data(name)
+
+        if not barrel_roll_data.barrel_roll then
+            barrel_roll_data.barrel_roll = {[number] = {time = get_us_time(), x = x, z = z}}
+            player:set_properties{damage_texture_modifier = ""}
+            -- Clear out any hit data on barrel roll.
+            remove_hits(name)
+        elseif barrel_roll_data.barrel_roll and not barrel_roll_data.barrel_roll[number] then
+            barrel_roll_data.barrel_roll[number] = {time = get_us_time(), x = x, z = z}
+            player:set_properties{damage_texture_modifier = ""}
+            -- Clear out any hit data on barrel roll.
+            remove_hits(name)
+        else
+            return
+        end
+
+        local yaw = player:get_look_horizontal()
+        local co = cos(yaw)
+        local si = sin(yaw)
+        local re_x = co * x - si * z
+        local re_z = si * x + co * z
+
+        player:add_player_velocity({x = re_x, y = 0, z = re_z})
+    end
+
+    -- Channel for barrel_roll request.
+    sscsm.register_on_com_receive("pvp_revamped:barrel_roll", function(name, msg)
+        if msg and type(msg) == "string" then
+            local player = get_player_by_name(name)
+            local yaw = player:get_look_horizontal()
+            local velocity = player:get_player_velocity().y
+            local aerial_points = 0
+
+            if velocity < 0.0 or velocity > 0.0 then
+                aerial_points = 4
+            end
+
+            if msg == "barrel_roll_l" then
+                barrel_roll(name, player, 1 + aerial_points, -barrel_roll_speed, 0)
+            elseif msg == "barrel_roll_u" then
+                barrel_roll(name, player, 2 + aerial_points, 0, barrel_roll_speed)
+            elseif msg == "barrel_roll_r" then
+                barrel_roll(name, player, 3 + aerial_points, barrel_roll_speed, 0)
+            elseif msg == "barrel_roll_d" then
+                barrel_roll(name, player, 4 + aerial_points, 0, -barrel_roll_speed)
+            else
+                return false
+            end
+        end
+    end)
+
+    local function dash(player, name, dash_key, x, y, z)
+        local dash_data = get_player_data(name)
+        
+        if not dash_data.dash then
+            dash_data.dash = {[dash_key] = get_us_time()}
+        elseif dash_data.dash and not dash_data.dash[dash_key] then
+            dash_data.dash[dash_key] = get_us_time()
+        else
+            return 
+        end
+        
+        local yaw = player:get_look_horizontal()
+        local co = cos(yaw)
+        local si = sin(yaw)
+        local re_x = co * x - si * z
+        local re_z = si * x + co * z
+
+        player:add_player_velocity({x = re_x, y = y, z = re_z})
+    end
+
+    -- Channel for dash request.
+    sscsm.register_on_com_receive("pvp_revamped:dash", function(name, msg)
+        if msg and type(msg) == "string" then
+            local player = get_player_by_name(name)
+            local y = dash_speed * 0.5
+            local aerial_points = 0
+            local velocity = player:get_player_velocity().y
+
+            if velocity < 0.0 or velocity > 0.0 then
+                aerial_points = 4
+            end
+
+            if msg == "dash_l" then
+                dash(player, name, 1 + aerial_points, -dash_speed, y, 0)
+            elseif msg == "dash_u" then
+                dash(player, name, 2 + aerial_points, 0, y, dash_speed)
+            elseif msg == "dash_r" then
+                dash(player, name, 3 + aerial_points, dash_speed, y, 0)
+            elseif msg == "dash_d" then
+                dash(player, name, 4 + aerial_points, 0, y, -dash_speed)
+            else
+                return false
+            end
+        end
+    end)
+
+    -- Channel for shield_block request.
+    if minetest.global_exists("armor") then
+        sscsm.register_on_com_receive("pvp_revamped:shield_block", function(name, msg)
+            if msg and type(msg) == "string" then
+                local data_shield = player_persistent_data[name].inventory_armor_shield
+
+                if data_shield then
+                    local data = get_player_data(name)
+                    local time = get_us_time()
+
+                    data.shield = {pool = data_shield.block_pool, name = data_shield.name, index = data_shield.index, initial_time = time, time = time, duration = data_shield.duration, hasty_guard_duration = data_shield.hasty_guard_duration, armor_inv = true}
+                    data.block = nil
+                    player_data[name] = data
+
+                    get_player_by_name(name):set_properties{damage_texture_modifier = ""}
+                end
+            end
+        end)
+    end
+end