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

Revert "Updates Packets & Randomizer (#43)" (#61)

Browse source 
This reverts commit 179cb50557.
This commit is contained in:
Kamron Batman 2019-11-11 08:46:11 -08:00 • committed by GitHub
parent 179cb50557
commit c2ecc76457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
588 changed files with 16260 additions and 10926 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Projects/Scripts/Items/Clothing/BaseClothing.cs
View file

@ -724,7 +724,9 @@ namespace Server.Items
int number;
if (Name == null)
{
number = LabelNumber;
}
else
{
LabelTo(from, Name);
@ -734,7 +736,9 @@ namespace Server.Items
if (attrs.Count == 0 && Crafter == null && Name != null)
return;
EquipmentPackets.SendDisplayEquipmentInfo(from.NetState, this, number, m_Crafter, false, attrs);
EquipmentInfo eqInfo = new EquipmentInfo(number, m_Crafter, false, attrs.ToArray());
from.Send(new DisplayEquipmentInfo(this, eqInfo));
}
public virtual void AddEquipInfoAttributes(Mobile from, List<EquipInfoAttribute> attrs)
@ -900,13 +904,25 @@ namespace Server.Items
else
m_Resource = DefaultResource;
Attributes = GetSaveFlag(flags, SaveFlag.Attributes) ? new AosAttributes(this, reader) : new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Attributes))
Attributes = new AosAttributes(this, reader);
else
Attributes = new AosAttributes(this);
ClothingAttributes = GetSaveFlag(flags, SaveFlag.ClothingAttributes) ? new AosArmorAttributes(this, reader) : new AosArmorAttributes(this);
if (GetSaveFlag(flags, SaveFlag.ClothingAttributes))
ClothingAttributes = new AosArmorAttributes(this, reader);
else
ClothingAttributes = new AosArmorAttributes(this);
SkillBonuses = GetSaveFlag(flags, SaveFlag.SkillBonuses) ? new AosSkillBonuses(this, reader) : new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
SkillBonuses = new AosSkillBonuses(this, reader);
else
SkillBonuses = new AosSkillBonuses(this);
Resistances = GetSaveFlag(flags, SaveFlag.Resistances) ? new AosElementAttributes(this, reader) : new AosElementAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Resistances))
Resistances = new AosElementAttributes(this, reader);
else
Resistances = new AosElementAttributes(this);
if (GetSaveFlag(flags, SaveFlag.MaxHitPoints))
m_MaxHitPoints = reader.ReadEncodedInt();
@ -927,7 +943,8 @@ namespace Server.Items
else
m_StrReq = -1;
PlayerConstructed |= GetSaveFlag(flags, SaveFlag.PlayerConstructed);
if (GetSaveFlag(flags, SaveFlag.PlayerConstructed))
PlayerConstructed = true;
break;
}
@ -965,7 +982,8 @@ namespace Server.Items
}
}
PlayerConstructed |= version < 2; // we don't know, so, assume it's crafted
if (version < 2)
PlayerConstructed = true; // we don't know, so, assume it's crafted
if (version < 3)
{

1
Projects/Scripts/Items/Clothing/Hats.cs
View file

@ -2,6 +2,7 @@ using System;
using System.Collections.Generic;
using Server.Engines.Craft;
using Server.Misc;
using Server.Network;
namespace Server.Items
{