Skip to content

Commit

Permalink
6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Francesco authored and Francesco committed May 14, 2023
1 parent d77bef9 commit 46aa703
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 16 deletions.
3 changes: 1 addition & 2 deletions SCPUtils/Commands/CreateBroadcast.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
using CommandSystem;
using Exiled.Permissions.Extensions;
using MongoDB.Driver;
using System;

namespace SCPUtils.Commands
Expand Down Expand Up @@ -46,7 +45,7 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
else
{
var broadcast = string.Join(" ", arguments.Array, 3, arguments.Array.Length - 3);
GetBroadcast.AddBroadcast(arguments.Array[1].ToString(), duration, broadcast.ToString(), sender.LogName);
GetBroadcast.AddBroadcast(arguments.Array[1].ToString(), duration, broadcast.ToString(), sender.LogName);
response = "Success!";
return true;
}
Expand Down
3 changes: 2 additions & 1 deletion SCPUtils/Commands/Dupeip.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System;
using System.Text;


namespace SCPUtils.Commands
{
[CommandHandler(typeof(RemoteAdminCommandHandler))]
Expand Down Expand Up @@ -53,7 +52,9 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
StringBuilder message = new StringBuilder($"<color=green>[Accounts associated with the same IP ({databasePlayer.Ip} - {databasePlayer.Name} {databasePlayer.Id}@{databasePlayer.Authentication})]</color>").AppendLine();
foreach (var userId in databaseIp.UserIds)
{
//Log.Info(userId);
var databasePlayer2 = DatabasePlayer.GetDatabasePlayer(userId);

if (databasePlayer2 != null)
{

Expand Down
7 changes: 3 additions & 4 deletions SCPUtils/Commands/PlayerInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using Exiled.Permissions.Extensions;
using System;
using System.Linq;
using Log = Exiled.API.Features.Log;

namespace SCPUtils.Commands
{
Expand Down Expand Up @@ -42,13 +41,13 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
{
target = arguments.Array[1].ToString();
}
}
Player databasePlayer = target.GetDatabasePlayer();
}
Player databasePlayer = target.GetDatabasePlayer();
if (databasePlayer == null)
{
response = $"<color=yellow>Player not found on Database or Player is loading data!</color>";
return false;
}
}

string text = $"<color=green>\n[{databasePlayer.Name} ({databasePlayer.Id}@{databasePlayer.Authentication})]\n\n" +
$"Total SCP Suicides/Quits: [ {databasePlayer.ScpSuicideCount} ]\n" +
Expand Down
12 changes: 8 additions & 4 deletions SCPUtils/Database/DatabasePlayer.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Exiled.API.Extensions;
using MongoDB.Driver;
using MongoDB.Driver;
using System;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -17,20 +16,25 @@ public static string GetAuthentication(this Exiled.API.Features.Player player)
return player.UserId.Split('@')[1];
}


public static string GetRawUserId(this Exiled.API.Features.Player player)
{
return player.UserId.GetRawUserId();
}

public static string GetRawUserId(this string player)
{
return player.Split('@')[0];
}

public static Player GetDatabasePlayer(this string player)
{

// if(ExiledPlayer.Get(player)?.RawUserId is not ExiledPlayer exiledPlayer)

var onlinePlayer = ExiledPlayer.Get(player);
if (onlinePlayer == null)
{
return MongoDatabase.GetCollection<Player>("players").Find(x => x.Id == player || x.Name.ToLower() == player.ToLower()).FirstOrDefault();
return MongoDatabase.GetCollection<Player>("players").Find(x => x.Id == player.GetRawUserId() || x.Name.ToLower() == player.ToLower()).FirstOrDefault();
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion SCPUtils/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura />
<Costura IncludeAssemblies="MongoDB.*|DnsClient|Newtonsoft.Json|Microsoft.Extensions.Logging.Abstractions"/>
</Weavers>
2 changes: 1 addition & 1 deletion SCPUtils/Functions/EventHandlers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ internal void OnPlayerVerify(VerifiedEventArgs ev)
databasePlayer = ev.Player.GetDatabasePlayer();
}

if(Database.PlayerData.ContainsKey(ev.Player))
if (Database.PlayerData.ContainsKey(ev.Player))
{
Database.PlayerData.Remove(ev.Player);
}
Expand Down
5 changes: 2 additions & 3 deletions SCPUtils/Plugin.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using MongoDB.Bson;
using System;
using Features = Exiled.API.Features;
using Handlers = Exiled.Events.Handlers;
Expand Down Expand Up @@ -49,9 +48,9 @@ public void LoadEvents()
PlayerEvents.Handcuffing += EventHandlers.OnPlayerHandcuff;
PlayerEvents.RemovingHandcuffs += EventHandlers.OnPlayerUnhandCuff;
PlayerEvents.Banning += EventHandlers.OnBanned;
PlayerEvents.Kicking += EventHandlers.OnKicking;
PlayerEvents.Kicking += EventHandlers.OnKicking;



// PlayerEvents.ChangingRole += EventHandlers.OnChangingRole;
// ServerEvents.RoundStarted += EventHandlers.OnRoundStarted;
//PlayerEvents.TogglingOverwatch += EventHandlers.OnOverwatchToggle;
Expand Down

0 comments on commit 46aa703

Please sign in to comment.