warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup Expansions

Browse source 
WorldPacketSA should not be used yet. There is much more work to be done and that version has not been looked at in quite some time.
This commit is contained in:
mark 2010-06-17 07:11:43 +00:00
parent 01eee98298
commit 177eb4c6ff
26 changed files with 388 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Scripts/Items/Skill Items/Magical/Misc/Moongate.cs
View file

@ -112,7 +112,7 @@ namespace Server.Items
public virtual void UseGate( Mobile m )
{
int flags = m.NetState == null ? 0 : m.NetState.Flags;
ClientFlags flags = m.NetState == null ? ClientFlags.None : m.NetState.Flags;
if ( Factions.Sigil.ExistsOn( m ) )
{
@ -122,7 +122,7 @@ namespace Server.Items
{
m.SendLocalizedMessage( 1049543 ); // You decide against traveling to Felucca while you are still young.
}
else if ( (m.Kills >= 5 && m_TargetMap != Map.Felucca) || ( m_TargetMap == Map.Tokuno && (flags & 0x10) == 0 ) || ( m_TargetMap == Map.Malas && (flags & 0x8) == 0 ) || ( m_TargetMap == Map.Ilshenar && (flags & 0x4) == 0 ) )
else if ( (m.Kills >= 5 && m_TargetMap != Map.Felucca) || ( m_TargetMap == Map.Tokuno && (flags & ClientFlags.Tokuno) == 0 ) || ( m_TargetMap == Map.Malas && (flags & ClientFlags.Malas) == 0 ) || ( m_TargetMap == Map.Ilshenar && (flags & ClientFlags.Ilshenar) == 0 ) )
{
m.SendLocalizedMessage( 1019004 ); // You are not allowed to travel there.
}

8
Scripts/Items/Skill Items/Magical/Spellbook.cs
View file

@ -490,8 +490,6 @@ namespace Server.Items
{
}
private static readonly ClientVersion Version_400a = new ClientVersion( "4.0.0a" );
public void DisplayTo( Mobile to )
{
// The client must know about the spellbook or it will crash!
@ -506,7 +504,7 @@ namespace Server.Items
return;
// What will happen if the client doesn't know about our parent?
if ( to.NetState.IsPost6017 )
if ( to.NetState.ContainerGridLines )
to.Send( new ContainerContentUpdate6017( this ) );
else
to.Send( new ContainerContentUpdate( this ) );
@ -523,14 +521,14 @@ namespace Server.Items
return;
if ( Core.AOS ) {
if ( to.NetState.Version != null && to.NetState.Version >= Version_400a ) {
if ( to.NetState.NewSpellbook ) {
to.Send( new NewSpellbookContent( this, ItemID, BookOffset + 1, m_Content ) );
} else {
to.Send( new SpellbookContent( m_Count, BookOffset + 1, m_Content, this ) );
}
}
else {
if ( to.NetState.IsPost6017 ) {
if ( to.NetState.ContainerGridLines ) {
to.Send( new SpellbookContent6017( m_Count, BookOffset + 1, m_Content, this ) );
} else {
to.Send( new SpellbookContent( m_Count, BookOffset + 1, m_Content, this ) );