Fix ClassDAreTeammates config being ignored for Class-D friendly fire
This commit is contained in:
1 parent
4706b08c0b
commit
daeb7c1e59
1 file changed
+3
-6
@@ -28,12 +28,9 @@ namespace UsefulHints.EventHandlers.Modules
|
|||||||
|
|
||||||
if (ev.Attacker.Role.Side == ev.Player.Role.Side)
|
if (ev.Attacker.Role.Side == ev.Player.Role.Side)
|
||||||
{
|
{
|
||||||
if (ev.Attacker.Role.Team == Team.ClassD && ev.Player.Role.Team == Team.ClassD && Config.ClassDAreTeammates)
|
bool bothClassD = ev.Attacker.Role.Team == Team.ClassD && ev.Player.Role.Team == Team.ClassD;
|
||||||
{
|
|
||||||
ev.Attacker.ShowHint(string.Format(Config.FriendlyFireWarning), 1);
|
if (!bothClassD || Config.ClassDAreTeammates)
|
||||||
ev.Player.ShowHint(string.Format(Config.DamageTakenWarning, ev.Attacker.Nickname), 2);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
ev.Attacker.ShowHint(string.Format(Config.FriendlyFireWarning), 1);
|
ev.Attacker.ShowHint(string.Format(Config.FriendlyFireWarning), 1);
|
||||||
ev.Player.ShowHint(string.Format(Config.DamageTakenWarning, ev.Attacker.Nickname), 2);
|
ev.Player.ShowHint(string.Format(Config.DamageTakenWarning, ev.Attacker.Nickname), 2);
|
||||||
|
|||||||
Reference in new issue
Block a user