mirror of
https://bitbucket.org/Ioncannon/project-meteor-server.git
synced 2025-05-20 08:26:59 -04:00
mass replaced all methods to pascal case
This commit is contained in:
@@ -106,7 +106,7 @@ namespace FFXIVClassic_Map_Server
|
||||
{
|
||||
Zone parent = zoneList[parentZoneId];
|
||||
PrivateArea privArea = new PrivateArea(parent, reader.GetUInt32("id"), reader.GetString("className"), reader.GetString("privateAreaName"), reader.GetUInt16("dayMusic"), reader.GetUInt16("nightMusic"), reader.GetUInt16("battleMusic"));
|
||||
parent.addPrivateArea(privArea);
|
||||
parent.AddPrivateArea(privArea);
|
||||
}
|
||||
else
|
||||
continue;
|
||||
@@ -224,7 +224,7 @@ namespace FFXIVClassic_Map_Server
|
||||
if (!reader.IsDBNull(12))
|
||||
{
|
||||
string eventConditions = reader.GetString(12);
|
||||
npc.loadEventConditions(eventConditions);
|
||||
npc.LoadEventConditions(eventConditions);
|
||||
}
|
||||
|
||||
if (!zoneList.ContainsKey(npc.zoneId))
|
||||
@@ -233,7 +233,7 @@ namespace FFXIVClassic_Map_Server
|
||||
if (zone == null)
|
||||
continue;
|
||||
npc.zone = zone;
|
||||
zone.addActorToZone(npc);
|
||||
zone.AddActorToZone(npc);
|
||||
count++;
|
||||
|
||||
}
|
||||
@@ -297,7 +297,7 @@ namespace FFXIVClassic_Map_Server
|
||||
if (!reader.IsDBNull(12))
|
||||
{
|
||||
string eventConditions = reader.GetString(12);
|
||||
npc.loadEventConditions(eventConditions);
|
||||
npc.LoadEventConditions(eventConditions);
|
||||
}
|
||||
|
||||
if (!zoneList.ContainsKey(npc.zoneId))
|
||||
@@ -306,7 +306,7 @@ namespace FFXIVClassic_Map_Server
|
||||
if (zone == null)
|
||||
continue;
|
||||
npc.zone = zone;
|
||||
zone.addActorToZone(npc);
|
||||
zone.AddActorToZone(npc);
|
||||
count++;
|
||||
|
||||
}
|
||||
@@ -326,7 +326,7 @@ namespace FFXIVClassic_Map_Server
|
||||
Program.Log.Info("Loaded {0} npc(s).", count);
|
||||
}
|
||||
|
||||
//Moves the actor to the new zone if exists. No packets are sent nor position changed.
|
||||
//Moves the actor to the new zone if exists. No packets are sent nor position Changed.
|
||||
public void DoSeamlessZoneChange(Player player, uint destinationZoneId)
|
||||
{
|
||||
Area oldZone;
|
||||
@@ -334,19 +334,19 @@ namespace FFXIVClassic_Map_Server
|
||||
if (player.zone != null)
|
||||
{
|
||||
oldZone = player.zone;
|
||||
oldZone.removeActorFromZone(player);
|
||||
oldZone.RemoveActorFromZone(player);
|
||||
}
|
||||
|
||||
//Add player to new zone and update
|
||||
Zone newZone = GetZone(destinationZoneId);
|
||||
|
||||
//This server does not contain that zoneId
|
||||
//This server Does not contain that zoneId
|
||||
if (newZone == null)
|
||||
return;
|
||||
|
||||
newZone.addActorToZone(player);
|
||||
newZone.AddActorToZone(player);
|
||||
|
||||
LuaEngine.onZoneIn(player);
|
||||
LuaEngine.OnZoneIn(player);
|
||||
}
|
||||
|
||||
//Moves actor to new zone, and sends packets to spawn at the given zone entrance
|
||||
@@ -371,7 +371,7 @@ namespace FFXIVClassic_Map_Server
|
||||
if (player.zone != null)
|
||||
{
|
||||
oldZone = player.zone;
|
||||
oldZone.removeActorFromZone(player);
|
||||
oldZone.RemoveActorFromZone(player);
|
||||
}
|
||||
|
||||
//Add player to new zone and update
|
||||
@@ -380,12 +380,12 @@ namespace FFXIVClassic_Map_Server
|
||||
if (destinationPrivateArea == null)
|
||||
newArea = GetZone(destinationZoneId);
|
||||
else
|
||||
newArea = GetZone(destinationZoneId).getPrivateArea(destinationPrivateArea, 0);
|
||||
//This server does not contain that zoneId
|
||||
newArea = GetZone(destinationZoneId).GetPrivateArea(destinationPrivateArea, 0);
|
||||
//This server Does not contain that zoneId
|
||||
if (newArea == null)
|
||||
return;
|
||||
|
||||
newArea.addActorToZone(player);
|
||||
newArea.AddActorToZone(player);
|
||||
|
||||
//Update player actor's properties
|
||||
player.zoneId = newArea.actorId;
|
||||
@@ -396,13 +396,13 @@ namespace FFXIVClassic_Map_Server
|
||||
player.rotation = spawnRotation;
|
||||
|
||||
//Send packets
|
||||
player.playerSession.queuePacket(DeleteAllActorsPacket.buildPacket(player.actorId), true, false);
|
||||
player.playerSession.queuePacket(_0xE2Packet.buildPacket(player.actorId, 0x0), true, false);
|
||||
player.sendZoneInPackets(this, spawnType);
|
||||
player.playerSession.clearInstance();
|
||||
player.sendInstanceUpdate();
|
||||
player.playerSession.QueuePacket(DeleteAllActorsPacket.BuildPacket(player.actorId), true, false);
|
||||
player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.actorId, 0x0), true, false);
|
||||
player.SendZoneInPackets(this, spawnType);
|
||||
player.playerSession.ClearInstance();
|
||||
player.SendInstanceUpdate();
|
||||
|
||||
LuaEngine.onZoneIn(player);
|
||||
LuaEngine.OnZoneIn(player);
|
||||
}
|
||||
|
||||
//Moves actor within zone to spawn position
|
||||
@@ -428,8 +428,8 @@ namespace FFXIVClassic_Map_Server
|
||||
//Remove player from currentZone if transfer else it's login
|
||||
if (player.zone != null)
|
||||
{
|
||||
player.zone.removeActorFromZone(player);
|
||||
player.zone.addActorToZone(player);
|
||||
player.zone.RemoveActorFromZone(player);
|
||||
player.zone.AddActorToZone(player);
|
||||
|
||||
//Update player actor's properties;
|
||||
player.positionX = spawnX;
|
||||
@@ -438,9 +438,9 @@ namespace FFXIVClassic_Map_Server
|
||||
player.rotation = spawnRotation;
|
||||
|
||||
//Send packets
|
||||
player.playerSession.queuePacket(_0xE2Packet.buildPacket(player.actorId, 0x0), true, false);
|
||||
player.playerSession.queuePacket(player.createSpawnTeleportPacket(player.actorId, spawnType), true, false);
|
||||
player.sendInstanceUpdate();
|
||||
player.playerSession.QueuePacket(_0xE2Packet.BuildPacket(player.actorId, 0x0), true, false);
|
||||
player.playerSession.QueuePacket(player.CreateSpawnTeleportPacket(player.actorId, spawnType), true, false);
|
||||
player.SendInstanceUpdate();
|
||||
|
||||
}
|
||||
}
|
||||
@@ -451,31 +451,31 @@ namespace FFXIVClassic_Map_Server
|
||||
//Add player to new zone and update
|
||||
Zone zone = GetZone(player.zoneId);
|
||||
|
||||
//This server does not contain that zoneId
|
||||
//This server Does not contain that zoneId
|
||||
if (zone == null)
|
||||
return;
|
||||
|
||||
//Set the current zone and add player
|
||||
//Set the current zone and Add player
|
||||
player.zone = zone;
|
||||
|
||||
LuaEngine.onBeginLogin(player);
|
||||
LuaEngine.OnBeginLogin(player);
|
||||
|
||||
zone.addActorToZone(player);
|
||||
zone.AddActorToZone(player);
|
||||
|
||||
//Send packets
|
||||
player.sendZoneInPackets(this, 0x1);
|
||||
player.SendZoneInPackets(this, 0x1);
|
||||
|
||||
LuaEngine.onLogin(player);
|
||||
LuaEngine.onZoneIn(player);
|
||||
LuaEngine.OnLogin(player);
|
||||
LuaEngine.OnZoneIn(player);
|
||||
}
|
||||
|
||||
public void reloadZone(uint zoneId)
|
||||
public void ReloadZone(uint zoneId)
|
||||
{
|
||||
if (!zoneList.ContainsKey(zoneId))
|
||||
return;
|
||||
|
||||
Zone zone = zoneList[zoneId];
|
||||
//zone.clear();
|
||||
//zone.Clear();
|
||||
LoadNPCs(zone.actorId);
|
||||
|
||||
}
|
||||
@@ -552,7 +552,7 @@ namespace FFXIVClassic_Map_Server
|
||||
}
|
||||
}
|
||||
|
||||
public ZoneEntrance getZoneEntrance(uint entranceId)
|
||||
public ZoneEntrance GetZoneEntrance(uint entranceId)
|
||||
{
|
||||
if (zoneEntranceList.ContainsKey(entranceId))
|
||||
return zoneEntranceList[entranceId];
|
||||
|
||||
Reference in New Issue
Block a user