diff --git a/Server/Effects.cs b/Server/Effects.cs index d2d16db7b..5edef06fd 100644 --- a/Server/Effects.cs +++ b/Server/Effects.cs @@ -54,7 +54,7 @@ namespace Server public static bool SendParticlesTo( NetState state ) { - return ( m_ParticleSupportType == ParticleSupportType.Full || (m_ParticleSupportType == ParticleSupportType.Detect && state.Version != null && state.Version.Type == ClientType.UOTD) ); + return ( m_ParticleSupportType == ParticleSupportType.Full || (m_ParticleSupportType == ParticleSupportType.Detect && state.IsUOTDClient) ); } public static void PlaySound( IPoint3D p, Map map, int soundID ) diff --git a/Server/Mobile.cs b/Server/Mobile.cs index 5af4d89ac..11a119684 100644 --- a/Server/Mobile.cs +++ b/Server/Mobile.cs @@ -3120,7 +3120,7 @@ namespace Server if( !InternalOnMove( d ) ) return false; - if( m_FwdEnabled && m_NetState != null && m_AccessLevel < m_FwdAccessOverride && (!m_FwdUOTDOverride || (m_NetState.Version != null && m_NetState.Version.Type != ClientType.UOTD)) ) + if( m_FwdEnabled && m_NetState != null && m_AccessLevel < m_FwdAccessOverride && (!m_FwdUOTDOverride || !m_NetState.IsUOTDClient) ) { if( m_MoveRecords == null ) m_MoveRecords = new Queue( 6 ); diff --git a/Server/Network/NetState.cs b/Server/Network/NetState.cs index 60584ff73..74932c7ca 100644 --- a/Server/Network/NetState.cs +++ b/Server/Network/NetState.cs @@ -201,6 +201,14 @@ namespace Server.Network { } } + public bool IsUOTDClient + { + get + { + return ((m_Flags & 0x100) != 0 || (m_Version != null && m_Version.Type == ClientType.UOTD)); + } + } + public List Trades { get { return m_Trades; diff --git a/Server/Network/PacketHandlers.cs b/Server/Network/PacketHandlers.cs index 4d61cdc7f..625d49c28 100644 --- a/Server/Network/PacketHandlers.cs +++ b/Server/Network/PacketHandlers.cs @@ -1736,7 +1736,6 @@ namespace Server.Network public static void ClientVersion( NetState state, PacketReader pvSrc ) { CV version = state.Version = new CV( pvSrc.ReadString() ); - string kickMessage = null; if ( CV.Required != null && version < CV.Required ) @@ -1749,7 +1748,7 @@ namespace Server.Network kickMessage = "This server does not allow god clients to connect."; else if ( !CV.AllowRegular && version.Type == ClientType.Regular ) kickMessage = "This server does not allow regular clients to connect."; - else if ( !CV.AllowUOTD && version.Type == ClientType.UOTD ) + else if ( !CV.AllowUOTD && state.IsUOTDClient ) kickMessage = "This server does not allow UO:TD clients to connect."; if ( !CV.AllowGod && !CV.AllowRegular && !CV.AllowUOTD )