Merge branch 'master' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into method_casing

# Conflicts:
#	FFXIVClassic Map Server/CommandProcessor.cs
#	FFXIVClassic Map Server/WorldManager.cs
#	FFXIVClassic Map Server/actors/area/Area.cs
#	FFXIVClassic Map Server/actors/area/PrivateArea.cs
#	FFXIVClassic Map Server/actors/area/Zone.cs
#	FFXIVClassic Map Server/actors/chara/npc/Npc.cs
#	FFXIVClassic Map Server/common/Utils.cs
#	FFXIVClassic Map Server/dataobjects/ConnectedPlayer.cs
This commit is contained in:
Tahir Akhlaq 2016-06-14 22:54:02 +01:00
commit 335a59204c
521 changed files with 12848 additions and 10394 deletions

View file

@ -32,11 +32,11 @@ namespace FFXIVClassic_Map_Server.utils
}
}
public void NewTarget(string target)
public void NewTarget(string tarGet)
{
currentActorPropertyPacket.AddTarget();
currentTarget = target;
currentActorPropertyPacket.SetTarget(target);
currentTarget = tarGet;
currentActorPropertyPacket.SetTarget(tarGet);
}
public List<SubPacket> Done()