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

fixed derps causing client/server crashes

Browse Source
This commit is contained in:
Tahir Akhlaq
2016-06-16 03:01:10 +01:00
parent 8eaa920751
commit ac01224769
16 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FFXIVClassic Map Server/CommandProcessor.cs
View File

@@ -622,7 +622,7 @@ namespace FFXIVClassic_Map_Server
client.GetActor().SendInstanceUpdate();
client.QueuePacket(BasePacket.CreatePacket(SendMessagePacket.BuildPacket(client.actorID, client.actorID, SendMessagePacket.MESSAGE_TYPE_GENERAL_INFO, "", String.Format("Reseting zone {0}...", client.GetActor().zoneId)), true, false));
}
Server.GetWorldManager().reloadZone(client.GetActor().zoneId);
Server.GetWorldManager().ReloadZone(client.GetActor().zoneId);
return true;
}
#endregion

2
FFXIVClassic Map Server/WorldManager.cs
View File

@@ -464,7 +464,7 @@ namespace FFXIVClassic_Map_Server
LuaEngine.OnZoneIn(player);
}
public void reloadZone(uint zoneId)
public void ReloadZone(uint zoneId)
{
if (!zoneList.ContainsKey(zoneId))
return;

2
FFXIVClassic Map Server/actors/Actor.cs
View File

@@ -302,7 +302,7 @@ namespace FFXIVClassic_Map_Server.Actors
zone.BroadcastPacketAroundActor(this, ChangeSpeedPacket);
}
public void generateActorName(int actorNumber)
public void GenerateActorName(int actorNumber)
{
//Format Class Name
string className = this.className.Replace("Populace", "Ppl")

2
FFXIVClassic Map Server/actors/area/Area.cs
View File

@@ -347,7 +347,7 @@ namespace FFXIVClassic_Map_Server.Actors
return;
Npc npc = new Npc(mActorList.Count + 1, actorClass.actorClassId, location.uniqueId, actorId, location.x, location.y, location.z, location.rot, location.state, location.animId, actorClass.displayNameId, null, actorClass.classPath);
npc.loadEventConditions(actorClass.eventConditions);
npc.LoadEventConditions(actorClass.eventConditions);
AddActorToZone(npc);
}

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

@@ -3,7 +3,7 @@ using FFXIVClassic_Map_Server.actors;
using FFXIVClassic_Map_Server.Actors.Chara;
using FFXIVClassic_Map_Server.dataobjects;
using FFXIVClassic_Map_Server.lua;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.packets;
using FFXIVClassic_Map_Server.packets.receive.events;
using FFXIVClassic_Map_Server.packets.send.actor;
using FFXIVClassic_Map_Server.utils;
@@ -45,7 +45,7 @@ namespace FFXIVClassic_Map_Server.Actors
this.actorClassId = classId;
loadNpcAppearance(classId);
LoadNpcAppearance(classId);
this.classPath = classPath;
className = classPath.Substring(classPath.LastIndexOf("/")+1);
@@ -73,7 +73,7 @@ namespace FFXIVClassic_Map_Server.Actors
npcWork.pushCommand = 0x271D;
npcWork.pushCommandPriority = 1;
generateActorName((int)actorNumber);
GenerateActorName((int)actorNumber);
}
public SubPacket CreateAddActorPacket(uint playerActorId)
@@ -186,7 +186,7 @@ namespace FFXIVClassic_Map_Server.Actors
return actorClassId;
}
public void loadNpcAppearance(uint id)
public void LoadNpcAppearance(uint id)
{
using (MySqlConnection conn = new MySqlConnection(String.Format("Server={0}; Port={1}; Database={2}; UID={3}; Password={4}", ConfigConstants.DATABASE_HOST, ConfigConstants.DATABASE_PORT, ConfigConstants.DATABASE_NAME, ConfigConstants.DATABASE_USERNAME, ConfigConstants.DATABASE_PASSWORD)))
{
@@ -288,7 +288,7 @@ namespace FFXIVClassic_Map_Server.Actors
}
}
public void loadEventConditions(string eventConditions)
public void LoadEventConditions(string eventConditions)
{
EventList conditions = JsonConvert.DeserializeObject<EventList>(eventConditions);
this.eventConditions = conditions;

4
FFXIVClassic Map Server/actors/chara/player/Player.cs
View File

@@ -241,7 +241,7 @@ namespace FFXIVClassic_Map_Server.Actors
packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x4, "commandContent"));
packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x6, "commandJudgeMode"));
packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "commandRequest"));
packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "widGetCreate"));
packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "widgetCreate"));
packets.Add(_0x132Packet.BuildPacket(playerActorId, 0x100, "macroRequest"));
return packets;
}
@@ -386,7 +386,7 @@ namespace FFXIVClassic_Map_Server.Actors
for (int i = 0; i < charaWork.additionalCommandAcquired.Length; i++)
{
if (charaWork.additionalCommandAcquired[i] != false)
propPacketUtil.AddProperty(String.Format("charaWork.AdditionalCommandAcquired[{0}]", i));
propPacketUtil.AddProperty(String.Format("charaWork.additionalCommandAcquired[{0}]", i));
}
for (int i = 0; i < charaWork.parameterSave.commandSlot_compatibility.Length; i++)