From bd55a9e6086fb8c0a983498d422b7a52ac0c2326 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sun, 10 Dec 2023 22:25:08 +1100 Subject: [PATCH] Stop using deprecated FindData method --- MCGalaxy/Commands/Information/CmdBanInfo.cs | 5 +++-- MCGalaxy/CorePlugin/ConnectingHandler.cs | 4 ++-- MCGalaxy/MCGalaxy_.csproj | 1 + MCGalaxy/Player/Player.Login.cs | 17 +++++++++-------- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/MCGalaxy/Commands/Information/CmdBanInfo.cs b/MCGalaxy/Commands/Information/CmdBanInfo.cs index 5bf688021..0563689a2 100644 --- a/MCGalaxy/Commands/Information/CmdBanInfo.cs +++ b/MCGalaxy/Commands/Information/CmdBanInfo.cs @@ -35,10 +35,11 @@ namespace MCGalaxy.Commands.Info if (target == null) return; string nick = p.FormatNick(target); - string tempData = Server.tempBans.FindData(target); + string tempData = Server.tempBans.Get(target); string tempBanner = null, tempReason = null; DateTime tempExpiry = DateTime.MinValue; - if (tempData != null) { + + if (!string.IsNullOrEmpty(tempData)) { Ban.UnpackTempBanData(tempData, out tempReason, out tempBanner, out tempExpiry); } diff --git a/MCGalaxy/CorePlugin/ConnectingHandler.cs b/MCGalaxy/CorePlugin/ConnectingHandler.cs index 5356233ca..8c9fcba76 100644 --- a/MCGalaxy/CorePlugin/ConnectingHandler.cs +++ b/MCGalaxy/CorePlugin/ConnectingHandler.cs @@ -45,8 +45,8 @@ namespace MCGalaxy.Core { static bool CheckTempban(Player p) { try { - string data = Server.tempBans.FindData(p.name); - if (data == null) return true; + string data = Server.tempBans.Get(p.name); + if (string.IsNullOrEmpty(data)) return true; string banner, reason; DateTime expiry; diff --git a/MCGalaxy/MCGalaxy_.csproj b/MCGalaxy/MCGalaxy_.csproj index f8bb2b3bc..06a0f9155 100644 --- a/MCGalaxy/MCGalaxy_.csproj +++ b/MCGalaxy/MCGalaxy_.csproj @@ -540,6 +540,7 @@ + diff --git a/MCGalaxy/Player/Player.Login.cs b/MCGalaxy/Player/Player.Login.cs index 942767c89..940f35645 100644 --- a/MCGalaxy/Player/Player.Login.cs +++ b/MCGalaxy/Player/Player.Login.cs @@ -185,21 +185,22 @@ namespace MCGalaxy } void LoadCpeData() { - string skin = Server.skins.FindData(name); - if (skin != null) SkinName = skin; - string model = Server.models.FindData(name); - if (model != null) Model = model; + string skin = Server.skins.Get(name); + if (!string.IsNullOrEmpty(skin)) SkinName = skin; + + string model = Server.models.Get(name); + if (!string.IsNullOrEmpty(model)) Model = model; - string modelScales = Server.modelScales.FindData(name); - if (modelScales != null) { + string modelScales = Server.modelScales.Get(name); + if (!string.IsNullOrEmpty(modelScales)) { string[] bits = modelScales.SplitSpaces(3); Utils.TryParseSingle(bits[0], out ScaleX); Utils.TryParseSingle(bits[1], out ScaleY); Utils.TryParseSingle(bits[2], out ScaleZ); } - string rotations = Server.rotations.FindData(name); - if (rotations != null) { + string rotations = Server.rotations.Get(name); + if (!string.IsNullOrEmpty(rotations)) { string[] bits = rotations.SplitSpaces(2); Orientation rot = Rot; byte.TryParse(bits[0], out rot.RotX);