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

Merge branch 'general-devel' into patch-31

Browse source
This commit is contained in:
Chris 2021-08-02 18:58:04 +09:30 • committed by GitHub
commit b766b478fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -16,6 +16,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* Fixed SendTileRectHandler not sending tile rect updates like Pylons/Mannequins to other clients. (@Stealownz) * Fixed SendTileRectHandler not sending tile rect updates like Pylons/Mannequins to other clients. (@Stealownz)
* Fix some typos that have been in the repository for over a lustrum. (@Killia0) * Fix some typos that have been in the repository for over a lustrum. (@Killia0)
* Changed `/login` and `/register` to provide login help depending on if UUID login is enabled or disabled, and whether or not a player can login via any username or not. In addition, the message parameters will now be differentiated by colour instead of `<>` (@moisterrific, @hakusaro) * Changed `/login` and `/register` to provide login help depending on if UUID login is enabled or disabled, and whether or not a player can login via any username or not. In addition, the message parameters will now be differentiated by colour instead of `<>` (@moisterrific, @hakusaro)
* Added a new `DisablePrimeBombs` config option (`false` by default). Highly recommended to set this to `true` in order to prevent griefing on servers doing a `for the worthy` play-through, since the prime bombs on this seed can destroy most tiles and bypass region protection. (@moisterrific)
## TShock 4.5.5 ## TShock 4.5.5
* Changed the world autosave message so that it no longer warns of a "potential lag spike." (@hakusaro) * Changed the world autosave message so that it no longer warns of a "potential lag spike." (@hakusaro)

6
TShockAPI/Configuration/TShockConfig.cs
View file

@ -157,6 +157,12 @@ namespace TShockAPI.Configuration
[Description("Disables tombstone dropping during death for all players.")] [Description("Disables tombstone dropping during death for all players.")]
public bool DisableTombstones = true; public bool DisableTombstones = true;
/// <summary>
/// Disables Skeletron Prime Bombs from spawning, useful for preventing unwanted world destruction on for the worthy seed world.
/// </summary>
[Description("Disables Skeletron Prime Bombs from spawning, useful for preventing unwanted world destruction on for the worthy seed world.")]
public bool DisablePrimeBombs;
/// <summary>Forces the world time to be normal, day, or night.</summary> /// <summary>Forces the world time to be normal, day, or night.</summary>
[Description("Forces the world time to be normal, day, or night.")] [Description("Forces the world time to be normal, day, or night.")]
public string ForceTime = "normal"; public string ForceTime = "normal";

9
TShockAPI/TShock.cs
View file

@ -1618,15 +1618,18 @@ namespace TShockAPI
private void OnProjectileSetDefaults(SetDefaultsEventArgs<Projectile, int> e) private void OnProjectileSetDefaults(SetDefaultsEventArgs<Projectile, int> e)
{ {
//tombstone fix. //tombstone fix.
if (e.Info == 43 || (e.Info >= 201 && e.Info <= 205) || (e.Info >= 527 && e.Info <= 531)) if (e.Info == ProjectileID.Tombstone || (e.Info >= ProjectileID.GraveMarker && e.Info <= ProjectileID.Obelisk) || (e.Info >= ProjectileID.RichGravestone1 && e.Info <= ProjectileID.RichGravestone5))
if (Config.Settings.DisableTombstones) if (Config.Settings.DisableTombstones)
e.Object.SetDefaults(0); e.Object.SetDefaults(0);
if (e.Info == 75) if (e.Info == ProjectileID.HappyBomb)
if (Config.Settings.DisableClownBombs) if (Config.Settings.DisableClownBombs)
e.Object.SetDefaults(0); e.Object.SetDefaults(0);
if (e.Info == 109) if (e.Info == ProjectileID.SnowBallHostile)
if (Config.Settings.DisableSnowBalls) if (Config.Settings.DisableSnowBalls)
e.Object.SetDefaults(0); e.Object.SetDefaults(0);
if (e.Info == ProjectileID.BombSkeletronPrime)
if (Config.Settings.DisablePrimeBombs)
e.Object.SetDefaults(0);
} }
/// <summary>NetHooks_SendData - Fired when the server sends data.</summary> /// <summary>NetHooks_SendData - Fired when the server sends data.</summary>