Cleanup & Fixes for .NET 5 (#309)
- [X] Fixes several bugs - [X] Updates more ordinal issues - [X] Cleans up the code a bit - [X] Turns classes static that should have been - [X] Changes TcpServer.Instances to a HashSet Bumps release version
This commit is contained in:
parent
4ad8811df2
commit
525cda5413
266 changed files with 1348 additions and 1800 deletions
|
|
@ -3,21 +3,6 @@ using Server.Targeting;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class UtilityItem
|
||||
{
|
||||
public static int RandomChoice(int itemID1, int itemID2)
|
||||
{
|
||||
var iRet = Utility.Random(2) switch
|
||||
{
|
||||
0 => itemID1,
|
||||
1 => itemID2,
|
||||
_ => itemID1
|
||||
};
|
||||
|
||||
return iRet;
|
||||
}
|
||||
}
|
||||
|
||||
// ********** Dough **********
|
||||
public class Dough : Item
|
||||
{
|
||||
|
|
@ -230,7 +215,7 @@ namespace Server.Items
|
|||
{
|
||||
if (!Movable)
|
||||
return;
|
||||
|
||||
|
||||
from.Target = new InternalTarget( this );
|
||||
}*/
|
||||
|
||||
|
|
@ -324,51 +309,51 @@ namespace Server.Items
|
|||
{
|
||||
Weight = 1.0;
|
||||
}
|
||||
|
||||
|
||||
public PitcherWater( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
if (!Movable)
|
||||
return;
|
||||
|
||||
|
||||
from.Target = new InternalTarget( this );
|
||||
}
|
||||
|
||||
|
||||
private class InternalTarget : Target
|
||||
{
|
||||
private PitcherWater m_Item;
|
||||
|
||||
|
||||
public InternalTarget( PitcherWater item ) : base( 1, false, TargetFlags.None )
|
||||
{
|
||||
m_Item = item;
|
||||
}
|
||||
|
||||
|
||||
protected override void OnTarget( Mobile from, object targeted )
|
||||
{
|
||||
if (m_Item.Deleted ) return;
|
||||
|
||||
|
||||
if (targeted is BowlFlour)
|
||||
{
|
||||
m_Item.Delete();
|
||||
((BowlFlour)targeted).Delete();
|
||||
|
||||
|
||||
from.AddToBackpack( new Dough() );
|
||||
from.AddToBackpack( new WoodenBowl() );
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue