cassidy/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-05-20 08:26:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Null event conditions get defaulted to empty conditions to allow anything to spawn. More work on the scripts. Committing the new sql schema + imports of all 3 town zones.

Browse Source
This commit is contained in:
Filip Maj
2016-06-12 18:43:41 -04:00
parent f0d4429f65
commit 957a8d89bb
4 changed files with 8680 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
FFXIVClassic Map Server/WorldManager.cs
View File

@@ -200,7 +200,7 @@ namespace FFXIVClassic_Map_Server
displayNameId,
eventConditions
FROM gamedata_actor_class
WHERE classPath <> '' AND eventConditions is not NULL
WHERE classPath <> ''
";
MySqlCommand cmd = new MySqlCommand(query, conn);
@@ -212,7 +212,12 @@ namespace FFXIVClassic_Map_Server
uint id = reader.GetUInt32("id");
string classPath = reader.GetString("classPath");
uint nameId = reader.GetUInt32("displayNameId");
string eventConditions = reader.GetString("eventConditions");
string eventConditions = null;
if (!reader.IsDBNull(3))
eventConditions = reader.GetString("eventConditions");
else
eventConditions = "{}";
ActorClass actorClass = new ActorClass(id, classPath, nameId, eventConditions);
actorClasses.Add(id, actorClass);

10
FFXIVClassic Map Server/actors/chara/npc/Npc.cs
View File

@@ -92,9 +92,11 @@ namespace FFXIVClassic_Map_Server.Actors
if (lParams == null)
{
classPath = "/Chara/Npc/Populace/PopulaceStandard";
className = "PopulaceStandard";
lParams = LuaUtils.createLuaParamList(classPath, false, false, false, false, false, 0xF47F6, false, false, 0, 1, "TEST");
string classPathFake = "/Chara/Npc/Populace/PopulaceStandard";
string classNameFake = "PopulaceStandard";
lParams = LuaUtils.createLuaParamList(classPathFake, false, false, false, false, false, 0xF47F6, false, false, 0, 0);
ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, classNameFake, lParams).debugPrintSubPacket();
return ActorInstantiatePacket.buildPacket(actorId, playerActorId, actorName, classNameFake, lParams);
}
else
{
@@ -302,7 +304,7 @@ namespace FFXIVClassic_Map_Server.Actors
if (File.Exists(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier)))
child = LuaEngine.loadScript(String.Format("./scripts/unique/{0}/{1}/{2}.lua", zone.zoneName, className, uniqueIdentifier));
if (parent == null)
if (parent == null && child == null)
{
LuaEngine.SendError(player, String.Format("ERROR: Could not find script for actor {0}.", getName()));
return null;