Solve merge issue

TomGrobbe · Aug 29, 2020 · 400ebc6 · 400ebc6
1 parent 6533f58
commit 400ebc6
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/vMenuServer/BanManager.cs b/vMenuServer/BanManager.cs
@@ -292,16 +292,14 @@ public static void RemoveBan(BanRecord record)
  /// </summary>
  /// <param name="source"></param>
  /// <param name="banRecordJsonString"></param>
- private void RemoveBanRecord([FromSource] Player source, string banRecordJsonString)
+ private void RemoveBanRecord([FromSource] Player source, string uuid)
  {
  if (source != null && !string.IsNullOrEmpty(source.Name) && source.Name.ToLower() != "**invalid**" && source.Name.ToLower() != "** invalid **")
  {
  if (IsPlayerAceAllowed(source.Handle, "vMenu.OnlinePlayers.Unban") || IsPlayerAceAllowed(source.Handle, "vMenu.OnlinePlayers.All") || IsPlayerAceAllowed(source.Handle, "vMenu.Everything"))
  {
- Debug.WriteLine(uuid);
  var banRecord = GetBanList().Find((ban) =>
  {
- Debug.WriteLine(ban.uuid.ToString());
  return ban.uuid.ToString() == uuid;
  });
  if (banRecord != null)