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

Support for > 6.0.1.7 (Containers, SecureTrade, SpellBook, Vendors, etc)

Browse source 
WarningGump Fixed
This commit is contained in:
mark 2007-08-08 20:30:14 +00:00
parent 3f839ed5bf
commit 57293771a2
12 changed files with 290 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Server/Network/PacketHandlers.cs
View file

@ -60,6 +60,7 @@ namespace Server.Network
public class PacketHandlers
{
private static PacketHandler[] m_Handlers;
private static PacketHandler[] m_6017Handlers;
private static PacketHandler[] m_ExtendedHandlersLow;
private static Dictionary<int, PacketHandler> m_ExtendedHandlersHigh;
@ -75,6 +76,7 @@ namespace Server.Network
static PacketHandlers()
{
m_Handlers = new PacketHandler[0x100];
m_6017Handlers = new PacketHandler[0x100];
m_ExtendedHandlersLow = new PacketHandler[0x100];
m_ExtendedHandlersHigh = new Dictionary<int, PacketHandler>();
@ -133,7 +135,7 @@ namespace Server.Network
Register( 0xB6, 9, true, new OnPacketReceive( ObjectHelpRequest ) );
Register( 0xB8, 0, true, new OnPacketReceive( ProfileReq ) );
Register( 0xBB, 9, false, new OnPacketReceive( AccountID ) );
Register( 0xBD, 0, true, new OnPacketReceive( ClientVersion ) );
Register( 0xBD, 0, false, new OnPacketReceive( ClientVersion ) );
Register( 0xBE, 0, true, new OnPacketReceive( AssistVersion ) );
Register( 0xBF, 0, true, new OnPacketReceive( ExtendedCommand ) );
Register( 0xC2, 0, true, new OnPacketReceive( UnicodePromptResponse ) );
@ -146,6 +148,8 @@ namespace Server.Network
Register( 0xD6, 0, true, new OnPacketReceive( BatchQueryProperties ) );
Register( 0xD7, 0, true, new OnPacketReceive( EncodedCommand ) );
Register6017( 0x08, 15, true, new OnPacketReceive( DropReq6017 ) );
RegisterExtended( 0x05, false, new OnPacketReceive( ScreenSize ) );
RegisterExtended( 0x06, true, new OnPacketReceive( PartyMessage ) );
RegisterExtended( 0x07, true, new OnPacketReceive( QuestArrow ) );
@ -171,6 +175,9 @@ namespace Server.Network
public static void Register( int packetID, int length, bool ingame, OnPacketReceive onReceive )
{
m_Handlers[packetID] = new PacketHandler( packetID, length, ingame, onReceive );
if ( m_6017Handlers[packetID] == null )
m_6017Handlers[packetID] = new PacketHandler( packetID, length, ingame, onReceive );
}
public static PacketHandler GetHandler( int packetID )
@ -178,6 +185,16 @@ namespace Server.Network
return m_Handlers[packetID];
}
public static void Register6017( int packetID, int length, bool ingame, OnPacketReceive onReceive )
{
m_6017Handlers[packetID] = new PacketHandler( packetID, length, ingame, onReceive );
}
public static PacketHandler Get6017Handler( int packetID )
{
return m_6017Handlers[packetID];
}
public static void RegisterExtended( int packetID, bool ingame, OnPacketReceive onReceive )
{
if ( packetID >= 0 && packetID < 0x100 )
@ -971,6 +988,27 @@ namespace Server.Network
from.Drop( loc );
}
public static void DropReq6017( NetState state, PacketReader pvSrc )
{
pvSrc.ReadInt32(); // serial, ignored
int x = pvSrc.ReadInt16();
int y = pvSrc.ReadInt16();
int z = pvSrc.ReadSByte();
pvSrc.ReadByte(); // Grid Location?
Serial dest = pvSrc.ReadInt32();
Point3D loc = new Point3D( x, y, z );
Mobile from = state.Mobile;
if ( dest.IsMobile )
from.Drop( World.FindMobile( dest ), loc );
else if ( dest.IsItem )
from.Drop( World.FindItem( dest ), loc );
else
from.Drop( loc );
}
public static void ConfigurationFile( NetState state, PacketReader pvSrc )
{
}
@ -1801,6 +1839,30 @@ namespace Server.Network
}
}
private class LoginTimer : Timer
{
private NetState m_State;
private Mobile m_Mobile;
public LoginTimer( NetState state, Mobile m ) : base( TimeSpan.FromSeconds( 1.0 ), TimeSpan.FromSeconds( 1.0 ) )
{
m_State = state;
m_Mobile = m;
}
protected override void OnTick()
{
if ( m_State == null )
Stop();
if ( m_State.Version != null )
{
m_State.BlockAllPackets = false;
DoLogin( m_State, m_Mobile );
Stop();
}
}
}
public static void PlayCharacter( NetState state, PacketReader pvSrc )
{
pvSrc.ReadInt32(); // 0xEDEDEDED
@ -1848,6 +1910,8 @@ namespace Server.Network
NetState.ProcessDisposedQueue();
state.Send( new ClientVersionReq() );
state.BlockAllPackets = true;
state.Flags = flags;
@ -1855,8 +1919,7 @@ namespace Server.Network
state.Mobile = m;
m.NetState = state;
state.BlockAllPackets = false;
DoLogin( state, m );
new LoginTimer( state, m ).Start();
}
}
}
@ -1993,6 +2056,8 @@ namespace Server.Network
race
);
state.Send( new ClientVersionReq() );
state.BlockAllPackets = true;
EventSink.InvokeCharacterCreated( args );
@ -2003,9 +2068,7 @@ namespace Server.Network
{
state.Mobile = m;
m.NetState = state;
state.BlockAllPackets = false;
DoLogin( state, m );
new LoginTimer( state, m ).Start();
}
else
{