mirror of
				https://bitbucket.org/Ioncannon/project-meteor-server.git
				synced 2025-05-20 08:26:59 -04:00 
			
		
		
		
	Merge branch 'develop' of https://bitbucket.org/Ioncannon/ffxiv-classic-server into ai
# Conflicts: # FFXIVClassic Map Server/actors/chara/player/Player.cs # FFXIVClassic Map Server/lua/LuaEngine.cs
This commit is contained in:
		| @@ -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)) | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user