Allow warden pings through, remove/factor draw manager

edgegamers · Jan 27, 2024 · c51c497 · c51c497
1 parent 48604f6
commit c51c497
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 67 deletions.
diff --git a/Jailbreak.sln b/Jailbreak.sln
@@ -22,8 +22,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "lang", "lang", "{CDCDE44E-0
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jailbreak.English", "lang\Jailbreak.English\Jailbreak.English.csproj", "{FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jailbreak.Draw", "mod\Jailbreak.Draw\Jailbreak.Draw.csproj", "{E809B726-088D-4BC6-95C9-EE6A991C8AA9}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,10 +56,6 @@ Global
 		{FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E809B726-088D-4BC6-95C9-EE6A991C8AA9}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{9135CCC9-66C5-4A9C-AE3C-91475B5F0437} = {177DA48D-8306-4102-918D-992569878581}
@@ -71,6 +65,5 @@ Global
 		{28EE05E4-8FE3-4CC6-AA03-0C533EFBFBF2} = {36BA84C0-291C-4930-A7C6-97CDF8F7F0D7}
 		{446E0B6F-E4FE-45E6-BD9B-BD943698327A} = {59311734-3648-43C2-B43C-385718B0D103}
 		{FC2D6F50-BCFF-41E6-A965-6C73CC01C3BF} = {CDCDE44E-01D2-4B76-99DA-A57E1E956038}
-		{E809B726-088D-4BC6-95C9-EE6A991C8AA9} = {36BA84C0-291C-4930-A7C6-97CDF8F7F0D7}
 	EndGlobalSection
 EndGlobal
diff --git a/mod/Jailbreak.Draw/DrawServiceExtension.cs b/mod/Jailbreak.Draw/DrawServiceExtension.cs
diff --git a/mod/Jailbreak.Draw/Global/DrawManager.cs b/mod/Jailbreak.Draw/Global/DrawManager.cs
diff --git a/mod/Jailbreak.Warden/Markers/WardenMarkerBehavior.cs b/mod/Jailbreak.Warden/Markers/WardenMarkerBehavior.cs
@@ -11,14 +11,12 @@ namespace Jailbreak.Warden.Markers;
 public class WardenMarkerBehavior : IPluginBehavior
 {
     private readonly IWardenService _warden;
-    private IDrawService _drawer;
 
     private DrawableShape? _marker;
 
-    public WardenMarkerBehavior(IWardenService warden, IDrawService drawer)
+    public WardenMarkerBehavior(IWardenService warden)
     {
         _warden = warden;
-        _drawer = drawer;
     }
 
     public void Start(BasePlugin plugin)
@@ -44,7 +42,6 @@ public HookResult OnPing(EventPlayerPing @event, GameEventInfo info)
 
     HookResult CommandListener_PlayerPing(CCSPlayerController? player, CommandInfo info)
     {
-        player.PrintToChat("CommandListener worked");
-        return HookResult.Handled;
+        return _warden.IsWarden(player) ? HookResult.Continue : HookResult.Handled;
     }
 }
diff --git a/public/Jailbreak.Public/Mod/Draw/IDrawService.cs b/public/Jailbreak.Public/Mod/Draw/IDrawService.cs
diff --git a/src/Jailbreak/Jailbreak.csproj b/src/Jailbreak/Jailbreak.csproj
@@ -33,7 +33,6 @@
 
     <ItemGroup>
       <ProjectReference Include="..\..\lang\Jailbreak.English\Jailbreak.English.csproj" />
-      <ProjectReference Include="..\..\mod\Jailbreak.Draw\Jailbreak.Draw.csproj" />
       <ProjectReference Include="..\..\mod\Jailbreak.Teams\Jailbreak.Teams.csproj" />
       <ProjectReference Include="..\..\mod\Jailbreak.Warden\Jailbreak.Warden.csproj" />
       <ProjectReference Include="..\..\public\Jailbreak.Public\Jailbreak.Public.csproj" />

diff --git a/src/Jailbreak/JailbreakServiceCollection.cs b/src/Jailbreak/JailbreakServiceCollection.cs
@@ -33,7 +33,6 @@ public void ConfigureServices(IServiceCollection serviceCollection)
 		serviceCollection.AddJailbreakGeneric();
 		serviceCollection.AddJailbreakWarden();
 		serviceCollection.AddJailbreakTeams();
-        serviceCollection.AddJailbreakDraw();
 
 		//	Add in english localization
 		serviceCollection.AddLanguage<Formatting.Languages.English>(config =>