Attempt to fix sm_hosties_lr_damage

azalty · Jul 10, 2023 · 087a979 · 087a979
1 parent 35ca66d
commit 087a979
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/addons/sourcemod/scripting/hosties/lastrequest.sp b/addons/sourcemod/scripting/hosties/lastrequest.sp
@@ -2115,26 +2115,25 @@ public Action OnTakeDamage(int victim, int &attacker, int &inflictor, float &dam
 					}
 					default:
 					{
-						if ((attacker == LR_Player_Guard && victim != LR_Player_Prisoner) || (attacker == LR_Player_Prisoner && victim != LR_Player_Guard) && type != LR_Rebel && (GetClientTeam(attacker) != GetClientTeam(victim)))
-						{
-							damage = 0.0;
-							return Plugin_Changed;
-						}
-						else if ((victim == LR_Player_Prisoner && attacker == LR_Player_Guard) || (victim == LR_Player_Guard && attacker == LR_Player_Prisoner))
-						{
-							return Plugin_Continue;
-						}
-						else if (victim == LR_Player_Prisoner || victim == LR_Player_Guard || attacker == LR_Player_Prisoner || attacker == LR_Player_Guard)
-						{
-							damage = 0.0;
-							return Plugin_Changed;
-						}
-						else if (!gH_Cvar_LR_Damage.BoolValue)
+						if ((victim == LR_Player_Prisoner && attacker == LR_Player_Guard) || (victim == LR_Player_Guard && attacker == LR_Player_Prisoner))
 						{
 							return Plugin_Continue;
 						}
 					}
 				}
+
+				// Prevent players that are not in a LastRequest together from damaging each other
+				if (gH_Cvar_LR_Damage.BoolValue && type != LR_Rebel) // Ignore this check for the Rebel LastRequest
+				{
+					if ((attacker == LR_Player_Guard && victim != LR_Player_Prisoner) || (attacker == LR_Player_Prisoner && victim != LR_Player_Guard) && (GetClientTeam(attacker) != GetClientTeam(victim)))
+					{
+						return Plugin_Handled;
+					}
+					else if (((attacker != LR_Player_Guard && victim == LR_Player_Prisoner) || (attacker != LR_Player_Prisoner && victim == LR_Player_Guard)) && attacker != victim)
+					{
+						return Plugin_Handled;
+					}
+				}
 			}
 		}
 	}