add some more locks, fixed typo in AddHP, add missing ability

FFXIVClassic Map Server/actors/area/Area.cs

@@ -113,7 +113,7 @@ namespace FFXIVClassic_Map_Server.Actors
             {
                 if (!mActorList.ContainsKey(actor.actorId))
                     mActorList.Add(actor.actorId, actor);
-            }
+
 
                 int gridX = (int)actor.positionX / boundingGridSize;
                 int gridY = (int)actor.positionZ / boundingGridSize;
@@ -134,10 +134,12 @@ namespace FFXIVClassic_Map_Server.Actors
                 lock (mActorBlock)
                     mActorBlock[gridX, gridY].Add(actor);
             }
+        }
 
         public void RemoveActorFromZone(Actor actor)
         {
             lock (mActorList)
+            {
                 mActorList.Remove(actor.actorId);
 
                 int gridX = (int)actor.positionX / boundingGridSize;
@@ -159,6 +161,7 @@ namespace FFXIVClassic_Map_Server.Actors
                 lock (mActorBlock)
                     mActorBlock[gridX, gridY].Remove(actor);
             }
+        }
 
         public void UpdateActorPosition(Actor actor)
         {
@@ -420,6 +423,8 @@ namespace FFXIVClassic_Map_Server.Actors
         }
 
         public void SpawnActor(SpawnLocation location)
+        {
+            lock (mActorList)
             {
                 ActorClass actorClass = Server.GetWorldManager().GetActorClass(location.classId);
 
@@ -440,8 +445,11 @@ namespace FFXIVClassic_Map_Server.Actors
 
                 AddActorToZone(npc);
             }
+        }
 
         public Npc SpawnActor(uint classId, string uniqueId, float x, float y, float z, float rot = 0, ushort state = 0, uint animId = 0, bool isMob = true)
+        {
+            lock (mActorList)
             {
                 ActorClass actorClass = Server.GetWorldManager().GetActorClass(classId);
 
@@ -468,8 +476,11 @@ namespace FFXIVClassic_Map_Server.Actors
 
                 return npc;
             }
+        }
 
         public Npc SpawnActor(uint classId, string uniqueId, float x, float y, float z, uint regionId, uint layoutId)
+        {
+            lock (mActorList)
             {
                 ActorClass actorClass = Server.GetWorldManager().GetActorClass(classId);
 
@@ -491,6 +502,7 @@ namespace FFXIVClassic_Map_Server.Actors
 
                 return npc;
             }
+        }
 
         public void DespawnActor(string uniqueId)
         {

FFXIVClassic Map Server/actors/area/PrivateAreaContent.cs

@@ -39,6 +39,8 @@ namespace FFXIVClassic_Map_Server.actors.area
         }
 
         public void CheckDestroy()
+        {
+            lock (mActorList)
             {
                 if (isContentFinished)
                 {
@@ -52,6 +54,7 @@ namespace FFXIVClassic_Map_Server.actors.area
                         GetParentZone().DeleteContentArea(this);
                 }
             }
+        }
 
     }
 }

FFXIVClassic Map Server/actors/area/Zone.cs

@@ -118,6 +118,8 @@ namespace FFXIVClassic_Map_Server.actors.area
         }
 
         public Actor FindActorInZone(uint id)
+        {
+            lock (mActorList)
             {
                 if (!mActorList.ContainsKey(id))
                 {
@@ -135,6 +137,7 @@ namespace FFXIVClassic_Map_Server.actors.area
                 else
                     return mActorList[id];
             }
+        }
 
         public PrivateAreaContent CreateContentArea(Player starterPlayer, string areaClassPath, string contentScript, string areaName, string directorName, params object[] args)
         {

FFXIVClassic Map Server/actors/chara/Character.cs

@@ -213,26 +213,9 @@ namespace FFXIVClassic_Map_Server.Actors
                 if ((updateFlags & ActorUpdateFlags.HpTpMp) != 0)
                 {
                     var propPacketUtil = new ActorPropertyPacketUtil("charaWork.parameterSave", this);
-
-                    //Parameters
-
-                    propPacketUtil.AddProperty("charaWork.parameterSave.hp[0]");
-                    propPacketUtil.AddProperty("charaWork.parameterSave.hpMax[0]");
                     propPacketUtil.AddProperty("charaWork.parameterSave.mp");
                     propPacketUtil.AddProperty("charaWork.parameterSave.mpMax");
                     propPacketUtil.AddProperty("charaWork.parameterTemp.tp");
-                    propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[0]");
-                    propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkillLevel");
-
-                    //General Parameters
-                    for (int i = 3; i < charaWork.battleTemp.generalParameter.Length; i++)
-                    {
-                        if (charaWork.battleTemp.generalParameter[i] != 0)
-                            propPacketUtil.AddProperty(String.Format("charaWork.battleTemp.generalParameter[{0}]", i));
-                    }
-
-                    propPacketUtil.AddProperty("charaWork.battleTemp.castGauge_speed[0]");
-                    propPacketUtil.AddProperty("charaWork.battleTemp.castGauge_speed[1]");
                     packets.AddRange(propPacketUtil.Done());
                 }
                 base.PostUpdate(tick, packets);

FFXIVClassic Map Server/actors/chara/ai/state/AttackState.cs

@@ -97,7 +97,7 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai.state
                 if (target is Player)
                     ((Player)target).SendPacket("139_attack");
             }
-            target.AddHP((short)damage);
+            target.DelHP((short)damage);
             attackTime = attackTime.AddMilliseconds(owner.GetAttackDelayMs());
             owner.LookAt(target);
            //this.errorPacket = BattleActionX01Packet.BuildPacket(target.actorId, owner.actorId, target.actorId, 0, effectId, 0, (ushort)BattleActionX01PacketCommand.Attack, (ushort)damage, 0);

FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs

@@ -12,6 +12,7 @@ using FFXIVClassic_Map_Server.actors.chara.ai;
 using FFXIVClassic_Map_Server.actors.chara.ai.controllers;
 using FFXIVClassic_Map_Server.packets.send.actor;
 using FFXIVClassic_Map_Server.actors.chara.ai.state;
+using FFXIVClassic_Map_Server.utils;
 
 namespace FFXIVClassic_Map_Server.Actors
 {
@@ -67,6 +68,25 @@ namespace FFXIVClassic_Map_Server.Actors
             this.statusEffects.Update(tick);
         }
 
+        public override void PostUpdate(DateTime tick, List<SubPacket> packets = null)
+        {
+            // todo: should probably add another flag for battleTemp since all this uses reflection
+            packets = new List<SubPacket>();
+            if ((updateFlags & ActorUpdateFlags.HpTpMp) != 0)
+            {
+                var propPacketUtil = new ActorPropertyPacketUtil("charaWork.parameterSave", this);
+
+                propPacketUtil.AddProperty("charaWork.parameterSave.hp[0]");
+                propPacketUtil.AddProperty("charaWork.parameterSave.hpMax[0]");
+                propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkill[0]");
+                propPacketUtil.AddProperty("charaWork.parameterSave.state_mainSkillLevel");
+
+                propPacketUtil.AddProperty("charaWork.battleTemp.castGauge_speed[0]");
+                propPacketUtil.AddProperty("charaWork.battleTemp.castGauge_speed[1]");
+                packets.AddRange(propPacketUtil.Done());
+            }
+        }
+
         public override bool CanAttack()
         {
             

FFXIVClassic Map Server/actors/chara/player/Player.cs

@@ -1715,6 +1715,19 @@ namespace FFXIVClassic_Map_Server.Actors
 
         public override void PostUpdate(DateTime tick, List<SubPacket> packets = null)
         {
+            // todo: should probably add another flag for battleTemp since all this uses reflection
+            packets = new List<SubPacket>();
+            if ((updateFlags & ActorUpdateFlags.HpTpMp) != 0)
+            {
+                var propPacketUtil = new ActorPropertyPacketUtil("charaWork.parameterSave", this);
+
+                propPacketUtil.AddProperty($"charaWork.parameterSave.hp[{currentJob}]");
+                propPacketUtil.AddProperty($"charaWork.parameterSave.hpMax[{currentJob}]");
+                propPacketUtil.AddProperty($"charaWork.parameterSave.state_mainSkill[{currentJob}]");
+
+                packets.AddRange(propPacketUtil.Done());
+            }
+
             base.PostUpdate(tick);
         }
 
@@ -1741,7 +1754,7 @@ namespace FFXIVClassic_Map_Server.Actors
             addHp = addHp.Clamp(short.MinValue, charaWork.parameterSave.hpMax[currentJob]);
             charaWork.parameterSave.hp[currentJob] = (short)addHp;
 
-            if (charaWork.parameterSave.hp[0] < 1)
+            if (charaWork.parameterSave.hp[currentJob] < 1)
                 Die(Program.Tick);
 
             updateFlags |= ActorUpdateFlags.HpTpMp;

sql/abilities.sql

@@ -86,6 +86,7 @@ INSERT INTO `abilities` VALUES (27146,'cover',16,30,0,0,0,1,0,0,5,0,15,0,0,60,0,
 INSERT INTO `abilities` VALUES (27147,'divine_veil',16,35,0,0,0,1,0,0,5,0,20,0,0,60,0,0,14,713,2,2);
 INSERT INTO `abilities` VALUES (27148,'hallowed_ground',16,50,0,0,0,1,0,0,5,0,0,0,0,900,0,0,14,709,2,2);
 INSERT INTO `abilities` VALUES (27149,'holy_succor',16,40,0,0,0,1,0,0,15,0,0,0,2,10,100,0,1,701,1,2);
+INSERT INTO `abilities` VALUES (27150,'fast_blade',3,1,1,32,0,1,1,0,5,0,0,0,0,10,0,1000,18,1023,1,2);
 INSERT INTO `abilities` VALUES (27151,'flat_blade',3,26,1,32,0,1,0,0,5,0,0,0,0,10,0,1500,18,1024,2,2);
 INSERT INTO `abilities` VALUES (27152,'savage_blade',3,10,1,32,0,1,0,0,5,0,0,0,0,30,0,1000,18,1025,1,2);
 INSERT INTO `abilities` VALUES (27153,'goring_blade',3,50,8,32,0,1,2,0,5,30,0,0,0,60,0,3000,18,1026,301,2);
@@ -210,4 +211,4 @@ commit;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2017-08-22 19:57:25
+-- Dump completed on 2017-08-23  3:05:29