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

Refactored some actor field names

Browse Source
This commit is contained in:
Filip Maj
2022-02-05 17:48:49 -05:00
parent 563118372a
commit 4e0cf36552
42 changed files with 462 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Map Server/Actors/Group/ContentGroup.cs
View File

@@ -52,7 +52,7 @@ namespace Meteor.Map.actors.group
}
this.director = director;
contentGroupWork._globalTemp.director = (ulong)director.actorId << 32;
contentGroupWork._globalTemp.director = (ulong)director.Id << 32;
}
public void Start()
@@ -67,8 +67,8 @@ namespace Meteor.Map.actors.group
if (actor == null)
return;
if(!members.Contains(actor.actorId))
members.Add(actor.actorId);
if(!members.Contains(actor.Id))
members.Add(actor.Id);
if (actor is Character)
((Character)actor).SetCurrentContentGroup(this);

4
Map Server/Actors/Group/MonsterParty.cs
View File

@@ -54,11 +54,11 @@ namespace Meteor.Map.actors.group
public override List<GroupMember> BuildMemberList(uint id)
{
List<GroupMember> groupMembers = new List<GroupMember>();
groupMembers.Add(new GroupMember(id, -1, 0, false, true, Server.GetWorldManager().GetActorInWorld(id).customDisplayName));
groupMembers.Add(new GroupMember(id, -1, 0, false, true, Server.GetWorldManager().GetActorInWorld(id).DisplayName));
foreach (uint charaId in monsterMembers)
{
if (charaId != id)
groupMembers.Add(new GroupMember(charaId, -1, 0, false, true, Server.GetWorldManager().GetActorInWorld(charaId).customDisplayName));
groupMembers.Add(new GroupMember(charaId, -1, 0, false, true, Server.GetWorldManager().GetActorInWorld(charaId).DisplayName));
}
return groupMembers;
}

6
Map Server/Actors/Group/Party.cs
View File

@@ -50,7 +50,7 @@ namespace Meteor.Map.actors.group
{
for (int i = 0; i < members.Count; i++)
{
if (Server.GetWorldManager().GetActorInWorld(members[i]).customDisplayName.Equals(name))
if (Server.GetWorldManager().GetActorInWorld(members[i]).DisplayName.Equals(name))
{
return members[i];
}
@@ -76,12 +76,12 @@ namespace Meteor.Map.actors.group
public override List<GroupMember> BuildMemberList(uint id)
{
List<GroupMember> groupMembers = new List<GroupMember>();
groupMembers.Add(new GroupMember(id, -1, 0, false, true, Server.GetWorldManager().GetActorInWorld(id).customDisplayName));
groupMembers.Add(new GroupMember(id, -1, 0, false, true, Server.GetWorldManager().GetActorInWorld(id).DisplayName));
foreach (uint charaId in members)
{
var chara = Server.GetWorldManager().GetActorInWorld(charaId);
if (charaId != id && chara != null)
groupMembers.Add(new GroupMember(charaId, -1, 0, false, true, chara.customDisplayName));
groupMembers.Add(new GroupMember(charaId, -1, 0, false, true, chara.DisplayName));
}
return groupMembers;
}

4
Map Server/Actors/Group/RelationGroup.cs
View File

@@ -73,8 +73,8 @@ namespace Meteor.Map.actors.group
uint hostId = (uint)((work._globalTemp.host >> 32) & 0xFFFFFFFF);
groupMembers.Add(new GroupMember(hostId, -1, 0, false, Server.GetServer().GetSession(hostId) != null, Server.GetWorldManager().GetActorInWorld(hostId).customDisplayName));
groupMembers.Add(new GroupMember(charaOther, -1, 0, false, Server.GetServer().GetSession(charaOther) != null, Server.GetWorldManager().GetActorInWorld(charaOther).customDisplayName));
groupMembers.Add(new GroupMember(hostId, -1, 0, false, Server.GetServer().GetSession(hostId) != null, Server.GetWorldManager().GetActorInWorld(hostId).DisplayName));
groupMembers.Add(new GroupMember(charaOther, -1, 0, false, Server.GetServer().GetSession(charaOther) != null, Server.GetWorldManager().GetActorInWorld(charaOther).DisplayName));
return groupMembers;
}

4
Map Server/Actors/Group/RetainerMeetingRelationGroup.cs
View File

@@ -50,8 +50,8 @@ namespace Meteor.Map.actors.group
{
List<GroupMember> groupMembers = new List<GroupMember>();
groupMembers.Add(new GroupMember(player.actorId, -1, 0x83, false, true, player.customDisplayName));
groupMembers.Add(new GroupMember(retainer.actorId, -1, 0x83, false, true, retainer.customDisplayName));
groupMembers.Add(new GroupMember(player.Id, -1, 0x83, false, true, player.DisplayName));
groupMembers.Add(new GroupMember(retainer.Id, -1, 0x83, false, true, retainer.DisplayName));
return groupMembers;
}

4
Map Server/Actors/Group/TradeGroup.cs
View File

@@ -73,8 +73,8 @@ namespace Meteor.Map.actors.group
uint hostId = (uint)((work._globalTemp.host >> 32) & 0xFFFFFFFF);
groupMembers.Add(new GroupMember(hostId, -1, 0, false, Server.GetServer().GetSession(hostId) != null, Server.GetWorldManager().GetActorInWorld(hostId).customDisplayName));
groupMembers.Add(new GroupMember(charaOther, -1, 0, false, Server.GetServer().GetSession(charaOther) != null, Server.GetWorldManager().GetActorInWorld(charaOther).customDisplayName));
groupMembers.Add(new GroupMember(hostId, -1, 0, false, Server.GetServer().GetSession(hostId) != null, Server.GetWorldManager().GetActorInWorld(hostId).DisplayName));
groupMembers.Add(new GroupMember(charaOther, -1, 0, false, Server.GetServer().GetSession(charaOther) != null, Server.GetWorldManager().GetActorInWorld(charaOther).DisplayName));
return groupMembers;
}