Core/UpdateFields: Fixes areatriggers from spells being really small.

This commit is contained in:
hondacrx
2021-02-21 13:56:25 -05:00
parent 470792f77f
commit 22100aa2f2
6 changed files with 16 additions and 18 deletions
@@ -282,8 +282,7 @@ namespace Game.Entities
public AreaTriggerMiscTemplate() public AreaTriggerMiscTemplate()
{ {
// legacy code from before it was known what each curve field does // legacy code from before it was known what each curve field does
// wtf? thats not how you pack curve data ExtraScale.Raw.Data[5] = 1065353217;
ExtraScale.Raw.Data[5] = (uint)1.0000001f;
// also OverrideActive does nothing on ExtraScale // also OverrideActive does nothing on ExtraScale
ExtraScale.Structured.OverrideActive = 1; ExtraScale.Structured.OverrideActive = 1;
} }
@@ -988,7 +988,7 @@ namespace Game.Entities
} }
} }
public struct SpellCastVisualField public class SpellCastVisualField
{ {
public uint SpellXSpellVisualID; public uint SpellXSpellVisualID;
public uint ScriptVisualID; public uint ScriptVisualID;
@@ -1010,7 +1010,7 @@ namespace Game.Entities
{ {
public uint SpellID; public uint SpellID;
public uint SpellXSpellVisualID; public uint SpellXSpellVisualID;
public SpellCastVisualField SpellVisual; public SpellCastVisualField SpellVisual = new SpellCastVisualField();
public void WriteCreate(WorldPacket data, Unit owner, Player receiver) public void WriteCreate(WorldPacket data, Unit owner, Player receiver)
{ {
@@ -2278,17 +2278,11 @@ namespace Game.Entities
} }
} }
public struct ChrCustomizationChoice : IComparable<ChrCustomizationChoice> public class ChrCustomizationChoice : IComparable<ChrCustomizationChoice>
{ {
public uint ChrCustomizationOptionID; public uint ChrCustomizationOptionID;
public uint ChrCustomizationChoiceID; public uint ChrCustomizationChoiceID;
public ChrCustomizationChoice(uint chrCustomizationOptionID, uint chrCustomizationChoiceID)
{
ChrCustomizationOptionID = chrCustomizationOptionID;
ChrCustomizationChoiceID = chrCustomizationChoiceID;
}
public void WriteCreate(WorldPacket data, WorldObject owner, Player receiver) public void WriteCreate(WorldPacket data, WorldObject owner, Player receiver)
{ {
data.WriteUInt32(ChrCustomizationOptionID); data.WriteUInt32(ChrCustomizationOptionID);
@@ -2467,7 +2461,7 @@ namespace Game.Entities
} }
} }
public struct CTROptions public class CTROptions
{ {
public uint ContentTuningConditionMask; public uint ContentTuningConditionMask;
public uint Field_4; public uint Field_4;
@@ -3195,7 +3189,7 @@ namespace Game.Entities
} }
} }
public struct MawPower public class MawPower
{ {
public int Field_0; public int Field_0;
public int Field_4; public int Field_4;
@@ -3240,7 +3234,7 @@ namespace Game.Entities
} }
} }
public struct RecipeProgressionInfo public class RecipeProgressionInfo
{ {
public ushort RecipeProgressionGroupID; public ushort RecipeProgressionGroupID;
public ushort Experience; public ushort Experience;
+1 -1
View File
@@ -2608,7 +2608,7 @@ namespace Game.Entities
do do
{ {
ChrCustomizationChoice choice; ChrCustomizationChoice choice = new ChrCustomizationChoice();
choice.ChrCustomizationOptionID = customizationsResult.Read<uint>(0); choice.ChrCustomizationOptionID = customizationsResult.Read<uint>(0);
choice.ChrCustomizationChoiceID = customizationsResult.Read<uint>(1); choice.ChrCustomizationChoiceID = customizationsResult.Read<uint>(1);
customizations.Add(choice); customizations.Add(choice);
+6 -1
View File
@@ -530,7 +530,12 @@ namespace Game
mirrorImageComponentedData.ClassID = (byte)creator.GetClass(); mirrorImageComponentedData.ClassID = (byte)creator.GetClass();
foreach (var customization in player.m_playerData.Customizations) foreach (var customization in player.m_playerData.Customizations)
mirrorImageComponentedData.Customizations.Add(new ChrCustomizationChoice(customization.ChrCustomizationOptionID, customization.ChrCustomizationChoiceID)); {
var chrCustomizationChoice = new ChrCustomizationChoice();
chrCustomizationChoice.ChrCustomizationOptionID = customization.ChrCustomizationOptionID;
chrCustomizationChoice.ChrCustomizationChoiceID = customization.ChrCustomizationChoiceID;
mirrorImageComponentedData.Customizations.Add(chrCustomizationChoice);
}
Guild guild = player.GetGuild(); Guild guild = player.GetGuild();
mirrorImageComponentedData.GuildGUID = (guild ? guild.GetGUID() : ObjectGuid.Empty); mirrorImageComponentedData.GuildGUID = (guild ? guild.GetGUID() : ObjectGuid.Empty);
@@ -1384,7 +1384,7 @@ namespace Game.Networking.Packets
public static implicit operator SpellCastVisualField(SpellCastVisual spellCastVisual) public static implicit operator SpellCastVisualField(SpellCastVisual spellCastVisual)
{ {
SpellCastVisualField visual; SpellCastVisualField visual = new SpellCastVisualField();
visual.SpellXSpellVisualID = spellCastVisual.SpellXSpellVisualID; visual.SpellXSpellVisualID = spellCastVisual.SpellXSpellVisualID;
visual.ScriptVisualID = spellCastVisual.ScriptVisualID; visual.ScriptVisualID = spellCastVisual.ScriptVisualID;
return visual; return visual;
+1 -1
View File
@@ -4040,7 +4040,7 @@ namespace Game.Spells
{ {
m_caster.ClearChannelObjects(); m_caster.ClearChannelObjects();
m_caster.SetChannelSpellId(0); m_caster.SetChannelSpellId(0);
m_caster.SetChannelVisual(default); m_caster.SetChannelVisual(new SpellCastVisualField());
} }
SpellChannelUpdate spellChannelUpdate = new SpellChannelUpdate(); SpellChannelUpdate spellChannelUpdate = new SpellChannelUpdate();