themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #2297 from drunderscore/feature/additional-tp-permissions

Browse source 
Implement additional teleport permissions
This commit is contained in:
Chris 2021-05-12 08:54:06 +09:30 • committed by GitHub
commit 563c439aee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -13,6 +13,8 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* If there is no section called "Upcoming changes" below this line, please add one with `## Upcoming changes` as the first line, and then a bulleted item directly after with the first change.
## Upcoming changes
* Added permissions for using Teleportation Potions, Magic Conch, and Demon Conch. (@drunderscore)
* `tshock.tp.tppotion`, `tshock.tp.magicconch`, and `tshock.tp.demonconch` respectively.
## TShock 4.5.2
* Added preliminary support for Terraria 1.4.2.2. (@hakusaro)

39
TShockAPI/GetDataHandlers.cs
View file

@ -134,6 +134,7 @@ namespace TShockAPI
{ PacketTypes.Teleport, HandleTeleport },
{ PacketTypes.PlayerHealOther, HandleHealOther },
{ PacketTypes.CatchNPC, HandleCatchNpc },
{ PacketTypes.TeleportationPotion, HandleTeleportationPotion },
{ PacketTypes.CompleteAnglerQuest, HandleCompleteAnglerQuest },
{ PacketTypes.NumberOfAnglerQuestsCompleted, HandleNumberOfAnglerQuestsCompleted },
{ PacketTypes.PlaceObject, HandlePlaceObject },
@ -3475,6 +3476,44 @@ namespace TShockAPI
return false;
}
private static bool HandleTeleportationPotion(GetDataHandlerArgs args)
{
var type = args.Data.ReadByte();
void Fail(string tpItem)
{
TShock.Log.ConsoleDebug("GetDataHandlers / HandleTeleportationPotion rejected permissions {0} {1}", args.Player.Name, type);
args.Player.SendErrorMessage("You do not have permission to teleport using {0}.", tpItem);
}
switch (type)
{
case 0: // Teleportation Potion
if (!args.Player.HasPermission(Permissions.tppotion))
{
Fail("Teleportation Potions");
return true;
}
break;
case 1: // Magic Conch
if (!args.Player.HasPermission(Permissions.magicconch))
{
Fail("the Magic Conch");
return true;
}
break;
case 2: // Demon Conch
if (!args.Player.HasPermission(Permissions.demonconch))
{
Fail("the Demon Conch");
return true;
}
break;
}
return false;
}
private static bool HandleCompleteAnglerQuest(GetDataHandlerArgs args)
{
// Since packet 76 is NEVER sent to us, we actually have to rely on this to get the true count

9
TShockAPI/Permissions.cs
View file

@ -271,6 +271,15 @@ namespace TShockAPI
[Description("User can use pylons to teleport")]
public static readonly string pylon = "tshock.tp.pylon";
[Description("User can use Teleportation Potions.")]
public static readonly string tppotion = "tshock.tp.tppotion";
[Description("User can use the Magic Conch.")]
public static readonly string magicconch = "tshock.tp.magicconch";
[Description("User can use the Demon Conch.")]
public static readonly string demonconch = "tshock.tp.demonconch";
#endregion
#region tshock.world nodes