[Bobbot-cvs] Plugins/Sphere/Messages PlayerJailedMessage.cs,1.4,1.5 PlayerReleasedMessage.cs,1.3,1.4

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bobbot/Plugins/Sphere/Messages
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20607/Sphere/Messages

Modified Files:
	PlayerJailedMessage.cs PlayerReleasedMessage.cs 
Log Message:
-I changed stuff apparently :D

Index: PlayerReleasedMessage.cs
===================================================================
RCS file: /cvsroot/bobbot/Plugins/Sphere/Messages/PlayerReleasedMessage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PlayerReleasedMessage.cs	17 Jul 2005 21:46:27 -0000	1.3
--- PlayerReleasedMessage.cs	18 Oct 2005 20:24:33 -0000	1.4
***************
*** 30,35 ****
  using UltimaOnline.Sphere.Connection.Messages;

! namespace Bot.Plugins.Sphere.Messages
! {
  	public delegate void PlayerReleasedEventHandler(object sender, PlayerReleasedEventArgs args);

--- 30,34 ----
  using UltimaOnline.Sphere.Connection.Messages;

! namespace Bot.Plugins.Sphere.Messages {
  	public delegate void PlayerReleasedEventHandler(object sender, PlayerReleasedEventArgs args);

***************
*** 37,44 ****
  	/// Summary description for PlayerReleasedMessage.
  	/// </summary>
! 	public class PlayerReleasedMessage : BaseMessage
! 	{
  		#region Members
  		protected Regex m_Regex = new Regex(
  			@"^([0-9]{2}:[0-9]{2}):\(.+\)JS::Player Released::GM:(.+)::Player:(.+)",
  			RegexOptions.Compiled			
--- 36,44 ----
  	/// Summary description for PlayerReleasedMessage.
  	/// </summary>
! 	public class PlayerReleasedMessage : BaseMessage {
  		#region Members
+ 
  		protected Regex m_Regex = new Regex(
+ 			//			@"^([0-9]{2}:[0-9]{2}):\(.+\)JS::Player Released::GM:(.+)::Player:(.+)",
  			@"^([0-9]{2}:[0-9]{2}):\(.+\)JS::Player Released::GM:(.+)::Player:(.+)",
  			RegexOptions.Compiled			
***************
*** 46,51 ****

  		protected DateTime m_Time;
! 		protected int m_GM;
! 		protected int m_Player;
  		#endregion

--- 46,54 ----

  		protected DateTime m_Time;
! 		//protected int m_GM;
! 		//protected int m_Player;
! 		protected string m_GM;
! 		protected string m_Player;
! 
  		#endregion

***************
*** 54,79 ****
  		/// The time this message was sent.
  		/// </summary>
! 		public DateTime Time
! 		{
  			get { return m_Time; }
  		}

! 		public int GM
! 		{
  			get { return m_GM; }
  		}

! 		public int Player
! 		{
  			get { return m_Player; }
  		}
  		#endregion

! 		public PlayerReleasedMessage()
! 		{
  		}

! 		public override bool CanParse(string message)
! 		{
  			if(m_Regex.IsMatch(message))
  				return true;
--- 57,77 ----
  		/// The time this message was sent.
  		/// </summary>
! 		public DateTime Time {
  			get { return m_Time; }
  		}

! 		public string GM {
  			get { return m_GM; }
  		}

! 		public string Player {
  			get { return m_Player; }
  		}
  		#endregion

! 		public PlayerReleasedMessage() {
  		}

! 		public override bool CanParse(string message) {
  			if(m_Regex.IsMatch(message))
  				return true;
***************
*** 82,87 ****
  		}

! 		public override void Parse(string message)
! 		{
  			if(!CanParse(message))
  				throw new MessageParserException("Cannot parse this message.", message);
--- 80,84 ----
  		}

! 		public override void Parse(string message) {
  			if(!CanParse(message))
  				throw new MessageParserException("Cannot parse this message.", message);
***************
*** 94,109 ****

  			m_Time = DateTime.Parse(match.Groups[1].Value);
! 			m_GM = Int32.Parse(match.Groups[2].Value, NumberStyles.AllowHexSpecifier);
! 			m_Player = Int32.Parse(match.Groups[3].Value, NumberStyles.AllowHexSpecifier);
  		}

! 		public override void Notify(SphereConnection server)
! 		{
  			server.OnCustomEvent(new PlayerReleasedEventArgs(this));
  		}
  	}

! 	public class PlayerReleasedEventArgs : System.EventArgs
! 	{
  		protected PlayerReleasedMessage m_Message;

--- 91,106 ----

  			m_Time = DateTime.Parse(match.Groups[1].Value);
! 			//m_GM = Int32.Parse(match.Groups[2].Value, NumberStyles.AllowHexSpecifier);
! 			//m_Player = Int32.Parse(match.Groups[3].Value, NumberStyles.AllowHexSpecifier);
! 			m_GM = match.Groups[2].Value;
! 			m_Player = match.Groups[3].Value;
  		}

! 		public override void Notify(SphereConnection server) {
  			server.OnCustomEvent(new PlayerReleasedEventArgs(this));
  		}
  	}

! 	public class PlayerReleasedEventArgs : System.EventArgs {
  		protected PlayerReleasedMessage m_Message;

***************
*** 111,116 ****
  		/// Gets the <see cref="Plugin.Messages.PlayerReleasedMessage"/> object of this event.
  		/// </summary>
! 		public PlayerReleasedMessage Message
! 		{
  			get { return m_Message; }
  		}
--- 108,112 ----
  		/// Gets the <see cref="Plugin.Messages.PlayerReleasedMessage"/> object of this event.
  		/// </summary>
! 		public PlayerReleasedMessage Message {
  			get { return m_Message; }
  		}
***************
*** 120,125 ****
  		/// </summary>
  		/// <param name="msg"></param>
! 		public PlayerReleasedEventArgs(PlayerReleasedMessage msg)
! 		{
  			m_Message = msg;
  		}
--- 116,120 ----
  		/// </summary>
  		/// <param name="msg"></param>
! 		public PlayerReleasedEventArgs(PlayerReleasedMessage msg) {
  			m_Message = msg;
  		}

Index: PlayerJailedMessage.cs
===================================================================
RCS file: /cvsroot/bobbot/Plugins/Sphere/Messages/PlayerJailedMessage.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PlayerJailedMessage.cs	17 Jul 2005 21:46:27 -0000	1.4
--- PlayerJailedMessage.cs	18 Oct 2005 20:24:33 -0000	1.5
***************
*** 41,51 ****
  		#region Members
  		protected Regex m_Regex = new Regex(
! 			@"^([0-9]{2}:[0-9]{2}):\(.+\)JS::Player Jailed::GM:(.+)::Player:(.+)::Length:(.+)::Reason:(.+)",
  			RegexOptions.Compiled			
  			);

  		protected DateTime m_Time;
! 		protected int m_GM;
! 		protected int m_Player;
  		protected string m_Length;
  		protected string m_Reason;
--- 41,56 ----
  		#region Members
  		protected Regex m_Regex = new Regex(
! 			//@"^([0-9]{2}:[0-9]{2}):\(.+\)JS::Player Jailed::GM:(.+)::Player:(.+)::Length:(.+)::Reason:(.+)",
! 			@"^([0-9]{2}:[0-9]{2}):\(.+\)JS::Player Jailed::GM:(.+)::PlayerAccount:(.+)::PlayerName:(.+)::PlayerChars:(.+)::Length:(.+)::Reason:(.+)",
  			RegexOptions.Compiled			
  			);

  		protected DateTime m_Time;
! 		//protected int m_GM;
! 		//protected int m_Player;
! 		protected string m_GM;
! 		protected string m_PlayerAccount;
! 		protected string m_PlayerName;
! 		protected int m_PlayerChars;
  		protected string m_Length;
  		protected string m_Reason;
***************
*** 61,72 ****
  		}

! 		public int GM
  		{
  			get { return m_GM; }
  		}

! 		public int Player
  		{
! 			get { return m_Player; }
  		}

--- 66,85 ----
  		}

! 		public string GM
  		{
  			get { return m_GM; }
  		}

! 		public string PlayerAccount
  		{
! 			get { return m_PlayerAccount; }
! 		}
! 
! 		public string PlayerName {
! 			get { return m_PlayerName; }
! 		}
! 
! 		public int PlayerChars {
! 			get { return m_PlayerChars; }
  		}

***************
*** 106,113 ****

  			m_Time = DateTime.Parse(match.Groups[1].Value);
! 			m_GM = Int32.Parse(match.Groups[2].Value, NumberStyles.AllowHexSpecifier);
! 			m_Player = Int32.Parse(match.Groups[3].Value, NumberStyles.AllowHexSpecifier);
! 			m_Length = match.Groups[4].Value;
! 			m_Reason = match.Groups[5].Value;
  		}

--- 119,134 ----

  			m_Time = DateTime.Parse(match.Groups[1].Value);
! 			//m_GM = Int32.Parse(match.Groups[2].Value, NumberStyles.AllowHexSpecifier);
! 			//m_Player = Int32.Parse(match.Groups[3].Value, NumberStyles.AllowHexSpecifier);
! 			m_GM = match.Groups[2].Value;
! 			m_PlayerAccount = match.Groups[3].Value;
! 			m_PlayerName = match.Groups[4].Value;
! 			try {
! 				m_PlayerChars = Int32.Parse( match.Groups[5].Value );
! 			} catch {
! 				m_PlayerChars = 5;
! 			}
! 			m_Length = match.Groups[6].Value;
! 			m_Reason = match.Groups[7].Value;
  		}