From 1f86415dfc3bf72eca38d960e8fa3a0ee59ce0d4 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Mon, 15 Feb 2016 09:52:27 +1100 Subject: [PATCH] Player.players should be a field to avoid breaking backwards compatibility. (Thanks tommyz) --- Player/Player.cs | 10 +++++----- Player/PlayerInfo.cs | 2 +- Server/Server.cs | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Player/Player.cs b/Player/Player.cs index c245165c4..54fa351af 100644 --- a/Player/Player.cs +++ b/Player/Player.cs @@ -2414,16 +2414,16 @@ catch { }*/ #endregion #region == OTHER == - [Obsolete] - public static List players { get { return PlayerInfo.players; } } + [Obsolete("Use PlayerInfo.players")] + public static List players; - [Obsolete] + [Obsolete("Use PlayerInfo.Find(name)")] public static Player Find(string name) { return PlayerInfo.Find(name); } - [Obsolete] + [Obsolete("Use PlayerInfo.FindExact(name)")] public static Player FindExact(string name) { return PlayerInfo.FindExact(name); } - [Obsolete] + [Obsolete("Use PlayerInfo.FindNick(name)")] public static Player FindNick(string name) { return PlayerInfo.FindNick(name); } static byte FreeId() { diff --git a/Player/PlayerInfo.cs b/Player/PlayerInfo.cs index d57614aaa..32c740c5a 100644 --- a/Player/PlayerInfo.cs +++ b/Player/PlayerInfo.cs @@ -22,7 +22,7 @@ namespace MCGalaxy { public static class PlayerInfo { /// List of all server players. - public static List players = new List(); + public static List players; public static List GetPlayers() { return new List(PlayerInfo.players); } diff --git a/Server/Server.cs b/Server/Server.cs index 596d5fa9f..96aae8a03 100644 --- a/Server/Server.cs +++ b/Server/Server.cs @@ -408,6 +408,8 @@ namespace MCGalaxy } public void Start() { + PlayerInfo.players = new List(); + Player.players = PlayerInfo.players; StartTime = DateTime.UtcNow; StartTimeLocal = StartTime.ToLocalTime(); shuttingDown = false;