Skip to content

Update CTPA.cs #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JonnygamingTv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update CTPA.cs #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions NewEssentials/Commands/TPA/CTPA.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,29 @@ protected override async UniTask OnExecuteAsync()
string recipientName = Context.Parameters[0];

// TODO: Switch to UnturnedUserDirectory
if (!PlayerTool.tryGetSteamPlayer(recipientName, out SteamPlayer recipient))
if (!PlayerTool.tryGetSteamPlayer(recipientName, out SteamPlayer recipient)){
if(recipientName == "a") { //tpa a? I mean you could theoretically just make the player execute "/tpaccept" instead, but oh well fair enough.
ulong requesterSteamID = uPlayer.SteamId.m_SteamID;
if (m_TpaRequestManager.IsRequestOpen(requesterSteamID)) {
ulong firstRequester = m_TpaRequestManager.AcceptRequest(requesterSteamID);
UnturnedUser requester = m_UserDirectory.FindUser(firstRequester.ToString(), UserSearchMode.FindById);
if(requester != null) {
int delay = m_Configuration.GetValue<int>("teleportation:delay");
bool cancelOnMove = m_Configuration.GetValue<bool>("teleportation:cancelOnMove");
bool cancelOnDamage = m_Configuration.GetValue<bool>("teleportation:cancelOnDamage");
await uPlayer.PrintMessageAsync(m_StringLocalizer["tpa:accept:accepted_self", new { Requester = requester.DisplayName, Time = delay }]);
requester.PrintMessageAsync(m_StringLocalizer["tpa:accept:accepted_other", new {Recipient = uPlayer.DisplayName, Time = delay}]);
bool successful = await m_TeleportService.TeleportAsync(requester,new TeleportOptions(m_PluginAccessor.Instance, delay, cancelOnMove, cancelOnDamage));
if (!successful){
requester.PrintMessageAsync(m_StringLocalizer["teleport:canceled"], Color.DarkRed);
throw new UserFriendlyException(m_StringLocalizer["teleport:canceled"]);
}
await requester.Player.Player.TeleportToLocationAsync(uPlayer.Player.Player.transform.position);
}
}
} // a draft! This may not be 100% correct, but well they'll probably add spacesupported alias in OpenMod soon anyway
throw new UserFriendlyException(m_StringLocalizer["tpa:invalid_recipient", new {Recipient = recipientName}]);
}

ulong requesterSteamID = uPlayer.SteamId.m_SteamID;
ulong recipientSteamID = recipient.playerID.steamID.m_SteamID;
Expand All @@ -60,4 +81,4 @@ protected override async UniTask OnExecuteAsync()
ChatManager.serverSendMessage(m_StringLocalizer["tpa:delivered", new {Requester = uPlayer.DisplayName}], Color.white, toPlayer: recipient);
}
}
}
}