Skip to content

Commit

Permalink
Merge pull request #1 from ExtraConcentratedJuice/master
Browse files Browse the repository at this point in the history
dumb spaghet
  • Loading branch information
Eduardo Cisneros authored Mar 22, 2018
2 parents b724b77 + d44da91 commit 7006553
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
3 changes: 1 addition & 2 deletions DiscordHook/DiscordHook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ private void OnPlayerDeath(Player player, byte damage, Vector3 force, EDeathCaus
NoTP.Remove(Killer.SteamPlayer());
}
}
catch(Exception ex) { }
catch(Exception) { }

switch (death)
{
Expand Down Expand Up @@ -338,7 +338,6 @@ private void OnPlayerChat(SteamPlayer player, EChatMode mode, ref Color color, r
default:
title = Translations.Instance["player_chat"];
break;

}

foreach (ServerSetting bot in Configuration.Instance.Bots)
Expand Down
6 changes: 6 additions & 0 deletions DiscordHook/DiscordHook.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,27 @@
<ItemGroup>
<Reference Include="Assembly-CSharp">
<HintPath>..\Libraries\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\Libraries\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\Libraries\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rocket.API">
<HintPath>..\Libraries\Rocket.API.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rocket.Core">
<HintPath>..\Libraries\Rocket.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Rocket.Unturned">
<HintPath>..\Libraries\Rocket.Unturned.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -58,6 +63,7 @@
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<HintPath>..\Libraries\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
5 changes: 1 addition & 4 deletions DiscordHook/Sender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@ public static bool SendSingle(JObject WebHook, ServerSetting bot)

return true;
}
catch (Exception ex)
{
return false;
}
catch (Exception){ return false; }
}

public static bool[] Send(JObject WebHook)
Expand Down

0 comments on commit 7006553

Please sign in to comment.