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

massive branch sync

Browse source
This commit is contained in:
mark 2010-04-25 06:09:43 +00:00
parent 489bbabe93
commit b3e8ec0a08
192 changed files with 1249 additions and 1124 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Commands/Properties.cs
View file

@ -266,10 +266,18 @@ namespace Server.Commands
if( !( obj is IConvertible ) )
return "Property is not IConvertable.";
long v = (long)Convert.ChangeType( obj, TypeCode.Int64 );
v += realValues[i];
try
{
realProps[i].SetValue( realObjs[i], Convert.ChangeType( v, realProps[i].PropertyType ), null );
long v = (long)Convert.ChangeType( obj, TypeCode.Int64 );
v += realValues[i];
realProps[i].SetValue( realObjs[i], Convert.ChangeType( v, realProps[i].PropertyType ), null );
}
catch
{
return "Value could not be converted";
}
}
if ( realProps.Length == 1 )

7
Scripts/Commands/Statics.cs
View file

@ -6,6 +6,7 @@ using Server.Gumps;
using Server.Items;
using Server.Commands;
using Server.Targeting;
using System.Collections.Generic;
namespace Server
{
@ -201,7 +202,7 @@ namespace Server
for ( int i = 0; i < state.m_List.Count; ++i )
{
Item item = (Item)state.m_List[i];
Item item = state.m_List[i];
int xOffset = item.X - (state.m_X * 8);
int yOffset = item.Y - (state.m_Y * 8);
@ -551,13 +552,13 @@ namespace Server
private class DeltaState
{
public int m_X, m_Y;
public ArrayList m_List;
public List<Item> m_List;
public DeltaState( Point2D p )
{
m_X = p.X;
m_Y = p.Y;
m_List = new ArrayList();
m_List = new List<Item>();
}
}