Skip to content

Commit 9c046b5

Browse files
Fix combat mode activated message being sent twice
1 parent 7a5fb82 commit 9c046b5

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

Teleportation/Teleportation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<TargetFramework>net48</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
<RootNamespace>RestoreMonarchy.Teleportation</RootNamespace>
7-
<Version>1.8.2</Version>
7+
<Version>1.8.3</Version>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="RestoreMonarchy.RocketRedist" Version="3.24.5.1" ExcludeAssets="runtime" />
1212
</ItemGroup>
1313

14-
</Project>
14+
</Project>

Teleportation/Utils/TeleportationPluginExtensions.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public static void StartPlayerCombat(this TeleportationPlugin pluginInstance, CS
2929
timer.Start();
3030

3131
pluginInstance.SendMessageToPlayer(steamID, "CombatStart");
32-
UnturnedChat.Say(steamID, pluginInstance.Translate("CombatStart"), pluginInstance.MessageColor);
3332
}
3433
}
3534

@@ -50,7 +49,7 @@ public static void StartPlayerRaid(this TeleportationPlugin pluginInstance, CSte
5049
if (timer.Enabled)
5150
{
5251
timer.Enabled = false;
53-
}
52+
}
5453

5554
timer.Start();
5655
}
@@ -61,7 +60,7 @@ public static void StartPlayerRaid(this TeleportationPlugin pluginInstance, CSte
6160
timer.AutoReset = false;
6261
timer.Elapsed += (sender, e) =>
6362
{
64-
TaskDispatcher.QueueOnMainThread(() => pluginInstance.StopPlayerRaid(steamID));
63+
TaskDispatcher.QueueOnMainThread(() => pluginInstance.StopPlayerRaid(steamID));
6564
};
6665
timer.Start();
6766

@@ -119,4 +118,4 @@ public static bool IsPlayerInCave(this TeleportationPlugin plugin, UnturnedPlaye
119118
return false;
120119
}
121120
}
122-
}
121+
}

0 commit comments

Comments
 (0)