Misc Fixes

Game/Network/Packets/GuildPackets.cs

@@ -74,7 +74,7 @@ namespace Game.Network.Packets
         }
 
         public ObjectGuid GuildGUID;
-        public GuildInfo Info;
+        public GuildInfo Info = new GuildInfo();
         public bool HasGuildInfo;
 
         public class GuildInfo
@@ -453,7 +453,7 @@ namespace Game.Network.Packets
         public string NewLeaderName;
         public uint NewLeaderVirtualRealmAddress;
         public ObjectGuid OldLeaderGUID;
-        public string OldLeaderName;
+        public string OldLeaderName = "";
         public uint OldLeaderVirtualRealmAddress;
         public bool SelfPromoted;
     }
@@ -587,11 +587,11 @@ namespace Game.Network.Packets
 
         public override void Read()
         {
-            _worldPacket.WriteBits(Name.Length, 7);
-            _worldPacket.FlushBits();
+            uint nameLen = _worldPacket.ReadBits<uint>(7);
+            _worldPacket.ResetBitPos();
 
             RankOrder = _worldPacket.ReadInt32();
-            _worldPacket.WriteString(Name);
+            Name = _worldPacket.ReadString(nameLen);
         }
 
         public string Name;
@@ -874,10 +874,11 @@ namespace Game.Network.Packets
 
         public override void Write()
         {
-            _worldPacket .WriteUInt32( Version);
+            _worldPacket.WriteUInt32(Version);
             _worldPacket.WriteUInt32(RewardItems.Count);
 
-            RewardItems.ForEach(p => p.Write(_worldPacket));
+            foreach (var item in RewardItems)
+                item.Write(_worldPacket);
         }
 
         public List<GuildRewardItem> RewardItems;
@@ -1468,9 +1469,10 @@ namespace Game.Network.Packets
             data.WriteUInt32(RaceMask);
             data.WriteUInt32(MinGuildLevel);
             data.WriteUInt32(MinGuildRep);
-            data.WriteUInt32(Cost);
+            data.WriteUInt64(Cost);
 
-            AchievementsRequired.ForEach(p => data.WriteUInt32(p));
+            foreach (var achievementId in AchievementsRequired)
+                data.WriteUInt32(achievementId);
         }
 
         public uint ItemID;

Game/Network/Packets/SpellPackets.cs

@@ -1138,15 +1138,20 @@ namespace Game.Network.Packets
             }
         }
 
-        public long Health;
-        public int AttackPower;
-        public int SpellPower;
+        long Health;
+        int AttackPower;
+        int SpellPower;
         List<SpellLogPowerData> PowerData = new List<SpellLogPowerData>();
     }
 
     class SandboxScalingData
     {
-        public bool GenerateDataForUnits(Creature attacker, Player target)
+        bool GenerateDataPlayerToPlayer(Player attacker, Player target)
+        {
+            return false;
+        }
+
+        bool GenerateDataCreatureToPlayer(Creature attacker, Player target)
         {
             CreatureTemplate creatureTemplate = attacker.GetCreatureTemplate();
 
@@ -1162,7 +1167,7 @@ namespace Game.Network.Packets
             return true;
         }
 
-        public bool GenerateDataForUnits(Player attacker, Creature target)
+        bool GenerateDataPlayerToCreature(Player attacker, Creature target)
         {
             CreatureTemplate creatureTemplate = target.GetCreatureTemplate();
 
@@ -1178,7 +1183,7 @@ namespace Game.Network.Packets
             return true;
         }
 
-        public bool GenerateDataForUnits(Creature attacker, Creature target)
+        bool GenerateDataCreatureToCreature(Creature attacker, Creature target)
         {
             CreatureTemplate creatureTemplate = target.HasScalableLevels() ? target.GetCreatureTemplate() : attacker.GetCreatureTemplate();
 
@@ -1203,11 +1208,11 @@ namespace Game.Network.Packets
                 Player playerTarget = target.ToPlayer();
                 Creature creatureTarget = target.ToCreature();
                 if (playerTarget)
-                    return GenerateDataForUnits(playerAttacker, playerTarget);
+                    return GenerateDataPlayerToPlayer(playerAttacker, playerTarget);
                 else if (creatureTarget)
                 {
                     if (creatureTarget.HasScalableLevels())
-                        return GenerateDataForUnits(playerAttacker, creatureTarget);
+                        return GenerateDataPlayerToCreature(playerAttacker, creatureTarget);
                 }
             }
             else if (creatureAttacker)
@@ -1215,11 +1220,14 @@ namespace Game.Network.Packets
                 Player playerTarget = target.ToPlayer();
                 Creature creatureTarget = target.ToCreature();
                 if (playerTarget)
-                    return GenerateDataForUnits(creatureAttacker, playerTarget);
+                {
+                    if (creatureAttacker.HasScalableLevels())
+                        return GenerateDataCreatureToPlayer(creatureAttacker, playerTarget);
+                }
                 else if (creatureTarget)
                 {
                     if (creatureAttacker.HasScalableLevels() || creatureTarget.HasScalableLevels())
-                        return GenerateDataForUnits(creatureAttacker, creatureTarget);
+                        return GenerateDataCreatureToCreature(creatureAttacker, creatureTarget);
                 }
             }