zydronium/project-meteor-server
1
0
Fork 0
mirror of https://bitbucket.org/Ioncannon/project-meteor-server.git synced 2025-07-24 19:38:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
# Conflicts:
#	FFXIVClassic Map Server/actors/chara/player/Player.cs
#	FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
Tahir Akhlaq 2017-08-26 18:04:31 +01:00
commit 922f3ccd1e
12 changed files with 106 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
FFXIVClassic Map Server/actors/chara/player/Player.cs
View file

@ -1466,6 +1466,25 @@ namespace FFXIVClassic_Map_Server.Actors
QueuePackets(propPacketUtil.Done());
}
public void SendStartCastbar(uint commandId, uint endTime)
{
playerWork.castCommandClient = commandId;
playerWork.castEndClient = endTime;
ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("playerWork/castState", this);
propPacketUtil.AddProperty("playerWork.castEndClient");
propPacketUtil.AddProperty("playerWork.castCommandClient");
QueuePackets(propPacketUtil.Done());
}
public void SendEndCastbar()
{
playerWork.castCommandClient = 0;
playerWork.castEndClient = 0;
ActorPropertyPacketUtil propPacketUtil = new ActorPropertyPacketUtil("playerWork/castState", this);
propPacketUtil.AddProperty("playerWork.castCommandClient");
QueuePackets(propPacketUtil.Done());
}
public void SetLoginDirector(Director director)
{
if (ownedDirectors.Contains(director))

4
FFXIVClassic Map Server/actors/chara/player/PlayerWork.cs
View file

@ -18,8 +18,8 @@
public bool isContentsCommand;
public int castCommandClient;
public int castEndClient;
public uint castCommandClient;
public uint castEndClient;
public int[] comboNextCommandId = new int[2];
public float comboCostBonusRate;