warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

@ -95,7 +95,7 @@ namespace Server.Guilds
if (pm.GuildRank.GetFlag(RankFlags.CanInvitePlayer))
{
pm.SendLocalizedMessage(1063048); // Whom do you wish to invite into your guild?
pm.BeginTarget(-1, false, TargetFlags.None, new TargetStateCallback(InvitePlayer_Callback), guild);
pm.BeginTarget(-1, false, TargetFlags.None, InvitePlayer_Callback, guild);
}
else
{
@ -104,13 +104,11 @@ namespace Server.Guilds
}
}
public void InvitePlayer_Callback(Mobile from, object targeted, object state)
public void InvitePlayer_Callback(Mobile from, object targeted, Guild g)
{
PlayerMobile pm = from as PlayerMobile;
PlayerMobile targ = targeted as PlayerMobile;
Guild g = state as Guild;
PlayerState guildState = PlayerState.Find(g.Leader);
PlayerState targetState = PlayerState.Find(targ);
@ -137,7 +135,7 @@ namespace Server.Guilds
{
pm.SendLocalizedMessage(1063051, targ.Name); // ~1_val~ is already a member of a guild.
}
else if (targ.HasGump(typeof(BaseGuildGump)) || targ.HasGump(typeof(CreateGuildGump))
else if (targ.HasGump<BaseGuildGump>() || targ.HasGump<CreateGuildGump>()
) //TODO: Check message if CreateGuildGump Open
{
pm.SendLocalizedMessage(1063052, targ.Name); // ~1_val~ is currently considering another guild invitation.