diff --git a/FFXIVClassic Map Server/WorldManager.cs b/FFXIVClassic Map Server/WorldManager.cs index 5bc2627d..2db7e281 100644 --- a/FFXIVClassic Map Server/WorldManager.cs +++ b/FFXIVClassic Map Server/WorldManager.cs @@ -267,7 +267,7 @@ namespace FFXIVClassic_Map_Server string query = @" SELECT - id, + gamedata_actor_class.id, classPath, displayNameId, propertyFlags, diff --git a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs index 22338a0a..ecf6738f 100644 --- a/FFXIVClassic Map Server/actors/chara/npc/Npc.cs +++ b/FFXIVClassic Map Server/actors/chara/npc/Npc.cs @@ -238,8 +238,14 @@ namespace FFXIVClassic_Map_Server.Actors } propPacketUtil.AddProperty("npcWork.hateType"); - propPacketUtil.AddProperty("npcWork.pushCommand"); - propPacketUtil.AddProperty("npcWork.pushCommandPriority"); + + if (npcWork.pushCommand != 0) + { + propPacketUtil.AddProperty("npcWork.pushCommand"); + if (npcWork.pushCommandSub != 0) + propPacketUtil.AddProperty("npcWork.pushCommandSub"); + propPacketUtil.AddProperty("npcWork.pushCommandPriority"); + } return BasePacket.CreatePacket(propPacketUtil.Done(), true, false); } diff --git a/sql/gamedata_actor_pushcommand.sql b/sql/gamedata_actor_pushcommand.sql index 96be7a89..b29fcc48 100644 --- a/sql/gamedata_actor_pushcommand.sql +++ b/sql/gamedata_actor_pushcommand.sql @@ -4,7 +4,7 @@ Source Host: localhost Source Database: ffxiv_server Target Host: localhost Target Database: ffxiv_server -Date: 1/10/2017 11:18:13 PM +Date: 1/10/2017 11:46:45 PM */ SET FOREIGN_KEY_CHECKS=0; @@ -34,13 +34,13 @@ INSERT INTO `gamedata_actor_pushcommand` VALUES ('1200053', '20005', '0', '6'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1200057', '20007', '0', '6'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1200054', '20002', '0', '6'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1200056', '20003', '0', '6'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280000', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280001', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280002', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280003', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280004', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280005', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280006', '10003', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280000', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280001', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280002', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280003', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280004', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280005', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280006', '10002', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280007', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280008', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280009', '10010', '0', '8'); @@ -65,12 +65,12 @@ INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280027', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280028', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280029', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280030', '10010', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280031', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280032', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280033', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280034', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280035', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280036', '10003', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280031', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280032', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280033', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280034', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280035', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280036', '10002', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280037', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280038', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280039', '10010', '0', '8'); @@ -91,16 +91,16 @@ INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280053', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280054', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280055', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280056', '10010', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280057', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280058', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280059', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280060', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280061', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280062', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280063', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280064', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280065', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280066', '10003', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280057', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280058', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280059', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280060', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280061', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280062', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280063', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280064', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280065', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280066', '10002', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280067', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280068', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280069', '10010', '0', '8'); @@ -122,15 +122,15 @@ INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280084', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280085', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280086', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280087', '10010', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280088', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280089', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280090', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280091', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280092', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280093', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280094', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280095', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280096', '10003', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280088', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280089', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280090', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280091', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280092', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280093', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280094', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280095', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280096', '10002', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280097', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280098', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280099', '10010', '0', '8'); @@ -151,14 +151,14 @@ INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280113', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280114', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280115', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280116', '10010', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280117', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280118', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280119', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280120', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280121', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280122', '10003', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280117', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280118', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280119', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280120', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280121', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280122', '10002', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280123', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280124', '10010', '0', '8'); INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280125', '10010', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280126', '10003', '0', '8'); -INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280127', '10003', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280126', '10002', '0', '8'); +INSERT INTO `gamedata_actor_pushcommand` VALUES ('1280127', '10002', '0', '8');