misc branch sync

This commit is contained in:
mark@runuo.com 2013-05-09 21:51:37 +00:00
parent 6b65990cc6
commit f61af43f94
5 changed files with 95 additions and 24 deletions

View file

@ -340,6 +340,24 @@ namespace Server.Items
}
}
/*
private sealed class MapDetailsNew : Packet
{
public MapDetailsNew( MapItem map ) : base ( 0xF5, 21 )
{
m_Stream.Write( (int) map.Serial );
m_Stream.Write( (short) 0x139D );
m_Stream.Write( (short) map.Bounds.Start.X );
m_Stream.Write( (short) map.Bounds.Start.Y );
m_Stream.Write( (short) map.Bounds.End.X );
m_Stream.Write( (short) map.Bounds.End.Y );
m_Stream.Write( (short) map.Width );
m_Stream.Write( (short) map.Height );
m_Stream.Write( (short) ( map.Facet == null ? 0 : map.Facet.MapID ) );
}
}
*/
private abstract class MapCommand : Packet
{
public MapCommand( MapItem map, int command, int number, int x, int y ) : base ( 0x56, 11 )

View file

@ -104,10 +104,6 @@ namespace Server.Items
(to as PlayerMobile).SetMountBlock(BlockMountType.Dazed, TimeSpan.FromSeconds( Core.ML ? 10 : 3 ), true);
}
else
{
to.Mount.Rider = null;
}
if (Core.AOS && from is PlayerMobile) /* only failsafe, attacker should already be dismounted */
{