diff --git a/changelog b/changelog
index e47a838d9..64766f1b5 100644
--- a/changelog
+++ b/changelog
@@ -27,4 +27,6 @@
 * Decreased the fusing difficulty of chlorine and calcium in the ICF which should hopefully make ClCa fuel pellets usable (untested)
 * Fixed loot piles only having a single block render AABB, causing armor rewards from red rooms to blink out of existence at certain angles
 * Fixed filled crate blocks not dropping crate items with a stack lock in place
-* Fixed stack lock not being applied when an item crate is opened, allowing them to be stacked while the item is open
\ No newline at end of file
+* Fixed stack lock not being applied when an item crate is opened, allowing them to be stacked while the item is open
+* Fixed clientonly melee component call on the power armor melee controller
+* Fixed SEDNA melee (bayonets, power armor melee) being able to punch dead or dying entities, which would swallow hits intended for entities behind them
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 9cc0ebd65..6d61ada57 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 mod_version=1.0.27
 # Empty build number makes a release type
-mod_build_number=5615
+mod_build_number=5616
 
 credits=HbMinecraft,\
   \ rodolphito (explosion algorithms),\
diff --git a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java
index d176e8b3a..104cdf2df 100644
--- a/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java
+++ b/src/main/java/com/hbm/items/weapon/sedna/factory/XFactoryPA.java
@@ -43,7 +43,7 @@ public class XFactoryPA {
 	}
 
 	public static BiConsumer<ItemStack, LambdaContext> ORCHESTRA = (stack, ctx) -> {
-		IPAMelee component = IPAWeaponsProvider.getMeleeComponentClient();
+		IPAMelee component = IPAWeaponsProvider.getMeleeComponentCommon(ctx.getPlayer());
 		if(component != null) component.orchestra(stack, ctx);
 	};
 	
@@ -54,11 +54,11 @@ public class XFactoryPA {
 	};
 	
 	public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_MELEE_PRIMARY = (stack, ctx) -> {
-		IPAMelee component = IPAWeaponsProvider.getMeleeComponentClient();
+		IPAMelee component = IPAWeaponsProvider.getMeleeComponentCommon(ctx.getPlayer());
 		if(component != null) component.clickPrimary(stack, ctx);
 	};
 	public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_MELEE_SENONDARY = (stack, ctx) -> {
-		IPAMelee component = IPAWeaponsProvider.getMeleeComponentClient();
+		IPAMelee component = IPAWeaponsProvider.getMeleeComponentCommon(ctx.getPlayer());
 		if(component != null) component.clickSecondary(stack, ctx);
 	};
 	
@@ -76,11 +76,11 @@ public class XFactoryPA {
 	}
 	
 	public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_RANGED_PRIMARY = (stack, ctx) -> {
-		IPARanged component = IPAWeaponsProvider.getRangedComponentClient();
+		IPARanged component = IPAWeaponsProvider.getRangedComponentCommon(ctx.getPlayer());
 		if(component != null) component.clickPrimary(stack, ctx);
 	};
 	public static BiConsumer<ItemStack, LambdaContext> LAMBDA_CLICK_RANGED_SENONDARY = (stack, ctx) -> {
-		IPARanged component = IPAWeaponsProvider.getRangedComponentClient();
+		IPARanged component = IPAWeaponsProvider.getRangedComponentCommon(ctx.getPlayer());
 		if(component != null) component.clickSecondary(stack, ctx);
 	};
 	
diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java
index 031997143..baaa00a7c 100644
--- a/src/main/java/com/hbm/lib/RefStrings.java
+++ b/src/main/java/com/hbm/lib/RefStrings.java
@@ -3,7 +3,7 @@ package com.hbm.lib;
 public class RefStrings {
 	public static final String MODID = "hbm";
 	public static final String NAME = "Hbm's Nuclear Tech Mod";
-	public static final String VERSION = "1.0.27 BETA (5615)";
+	public static final String VERSION = "1.0.27 BETA (5616)";
 	//HBM's Beta Naming Convention:
 	//V T (X)
 	//V -> next release version
diff --git a/src/main/java/com/hbm/util/EntityDamageUtil.java b/src/main/java/com/hbm/util/EntityDamageUtil.java
index bd82115d6..f61698803 100644
--- a/src/main/java/com/hbm/util/EntityDamageUtil.java
+++ b/src/main/java/com/hbm/util/EntityDamageUtil.java
@@ -454,7 +454,7 @@ public class EntityDamageUtil {
 		for(int i = 0; i < list.size(); ++i) {
 			Entity entity = (Entity) list.get(i);
 
-			if(entity.canBeCollidedWith()) {
+			if(entity.canBeCollidedWith() && entity.isEntityAlive()) {
 
 				double borderSize = entity.getCollisionBorderSize() + threshold;
 				AxisAlignedBB axisalignedbb = entity.boundingBox.expand(borderSize, borderSize, borderSize);