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

Merge branch 'general-devel' into patch-14

Browse source
This commit is contained in:
Chris 2020-06-05 12:17:42 +09:30 • committed by GitHub
commit 3d018a27af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -12,6 +12,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Add SyncTilePicking event. This is called when a player damages a tile. Implementing SyncTilePickingHandler and patching tile damaging related exploits. (Preventing player sending invalid world position data which disconnects other players.) * Add SyncTilePicking event. This is called when a player damages a tile. Implementing SyncTilePickingHandler and patching tile damaging related exploits. (Preventing player sending invalid world position data which disconnects other players.)
* Fix the issue where mobs could not be fished out during bloodmoon because of Bouncer checks. (@Patrikkk) * Fix the issue where mobs could not be fished out during bloodmoon because of Bouncer checks. (@Patrikkk)
* Update for OTAPI 2.0.0.37 and Terraria 1.4.0.5. (@hakusaro, @Patrikkk) * Update for OTAPI 2.0.0.37 and Terraria 1.4.0.5. (@hakusaro, @Patrikkk)
* Adding missing PlayerInfo data in GetDataHandler. (@Patrikkk)
## TShock 4.4.0 (Pre-release 10) ## TShock 4.4.0 (Pre-release 10)
* Fix all rope coils. (@Olink) * Fix all rope coils. (@Olink)

24
TShockAPI/ConfigFile.cs
View file

@ -272,22 +272,42 @@ namespace TShockAPI
/// <summary>Disables a player and reverts their actions if this number of tile kills is exceeded within 1 second.</summary> /// <summary>Disables a player and reverts their actions if this number of tile kills is exceeded within 1 second.</summary>
[Description("Disables a player and reverts their actions if this number of tile kills is exceeded within 1 second.")] [Description("Disables a player and reverts their actions if this number of tile kills is exceeded within 1 second.")]
public int TileKillThreshold = 60; public int TileKillThreshold = 60;
/// <summary>Whether or not to kick users when they surpass the TileKill threshold.</summary>
[Description("Whether or not to kick users when they surpass the TileKill threshold.")]
public bool KickOnTileKillThresholdBroken = false;
/// <summary>Disables a player and reverts their actions if this number of tile places is exceeded within 1 second.</summary> /// <summary>Disables a player and reverts their actions if this number of tile places is exceeded within 1 second.</summary>
[Description("Disables a player and reverts their actions if this number of tile places is exceeded within 1 second.")] [Description("Disables a player and reverts their actions if this number of tile places is exceeded within 1 second.")]
public int TilePlaceThreshold = 32; public int TilePlaceThreshold = 32;
/// <summary>Whether or not to kick users when they surpass the TilePlace threshold.</summary>
[Description("Whether or not to kick users when they surpass the TilePlace threshold.")]
public bool KickOnTilePlaceThresholdBroken = false;
/// <summary>Disables a player if this number of liquid sets is exceeded within 1 second.</summary> /// <summary>Disables a player if this number of liquid sets is exceeded within 1 second.</summary>
[Description("Disables a player if this number of liquid sets is exceeded within 1 second.")] [Description("Disables a player if this number of liquid sets is exceeded within 1 second.")]
public int TileLiquidThreshold = 50; public int TileLiquidThreshold = 50;
/// <summary>Whether or not to kick users when they surpass the TileLiquid threshold.</summary>
[Description("Whether or not to kick users when they surpass the TileLiquid threshold.")]
public bool KickOnTileLiquidThresholdBroken = false;
/// <summary>Disable a player if this number of projectiles is created within 1 second.</summary> /// <summary>Disable a player if this number of projectiles is created within 1 second.</summary>
[Description("Disable a player if this number of projectiles is created within 1 second.")] [Description("Disable a player if this number of projectiles is created within 1 second.")]
public int ProjectileThreshold = 50; public int ProjectileThreshold = 50;
/// <summary>Whether or not to kick users when they surpass the Projectile threshold.</summary>
[Description("Whether or not to kick users when they surpass the Projectile threshold.")]
public bool KickOnProjectileThresholdBroken = false;
/// <summary>Disables a player if this number of HealOtherPlayer packets is sent within 1 second.</summary> /// <summary>Disables a player if this number of HealOtherPlayer packets is sent within 1 second.</summary>
[Description("Disables a player if this number of HealOtherPlayer packets is sent within 1 second.")] [Description("Disables a player if this number of HealOtherPlayer packets is sent within 1 second.")]
public int HealOtherThreshold = 50; public int HealOtherThreshold = 50;
/// <summary>Whether or not to kick users when they surpass the HealOther threshold.</summary>
[Description("Whether or not to kick users when they surpass the HealOther threshold.")]
public bool KickOnHealOtherThresholdBroken = false;
/// <summary>Whether or not to ignore shrapnel from crystal bullets for the projectile threshold count.</summary> /// <summary>Whether or not to ignore shrapnel from crystal bullets for the projectile threshold count.</summary>
[Description("Whether or not to ignore shrapnel from crystal bullets for the projectile threshold count.")] [Description("Whether or not to ignore shrapnel from crystal bullets for the projectile threshold count.")]
@ -452,6 +472,10 @@ namespace TShockAPI
/// <summary>Disables a player if this number of tiles is painted within 1 second.</summary> /// <summary>Disables a player if this number of tiles is painted within 1 second.</summary>
[Description("Disables a player if this number of tiles is painted within 1 second.")] [Description("Disables a player if this number of tiles is painted within 1 second.")]
public int TilePaintThreshold = 15; public int TilePaintThreshold = 15;
/// <summary>Whether or not to kick users when they surpass the TilePaint threshold.</summary>
[Description("Whether or not to kick users when they surpass the TilePaint threshold.")]
public bool KickOnTilePaintThresholdBroken = false;
/// <summary>Forces Halloween-only events to occur all year.</summary> /// <summary>Forces Halloween-only events to occur all year.</summary>
[Description("Forces Halloween-only events to occur all year.")] [Description("Forces Halloween-only events to occur all year.")]

12
TShockAPI/GetDataHandlers.cs
View file

@ -2142,14 +2142,20 @@ namespace TShockAPI
byte difficulty = 0; byte difficulty = 0;
if (extra[0]) if (extra[0])
{ {
difficulty++; difficulty = 1;
} }
else if (extra[1]) else if (extra[1])
{ {
difficulty += 2; difficulty = 2;
}
else if (extra[3])
{
difficulty = 3;
} }
bool extraSlot = extra[2]; bool extraSlot = extra[2];
BitsByte torchFlags = args.Data.ReadInt8();
bool usingBiomeTorches = torchFlags[0];
bool happyFunTorchTime = torchFlags[1];
if (OnPlayerInfo(args.Player, args.Data, playerid, hair, skinVariant, difficulty, name)) if (OnPlayerInfo(args.Player, args.Data, playerid, hair, skinVariant, difficulty, name))
{ {