From 8c1cf3c15ed337c56911f2ac5a09059c747d9651 Mon Sep 17 00:00:00 2001 From: Pia Mancini Date: Thu, 20 Apr 2017 11:45:15 -0400 Subject: [PATCH 1/3] Add backers and sponsors from Open Collective Now your open collective backers and sponsors can to appear directly on your README. see how it'll look [here](https://github.com/apex/apex#backers) [More info](https://github.com/opencollective/opencollective/wiki/Github-banner) Also add badges on top --- README.md | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/README.md b/README.md index b379295e..da702579 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,9 @@

+[![OpenCollective](https://opencollective.com/tshock/backers/badge.svg)](#backers) +[![OpenCollective](https://opencollective.com/tshock/sponsors/badge.svg)](#sponsors) + TShock is a server modification for Terraria, written in C#, and based upon the [Terraria Server API](https://github.com/NyxStudios/TerrariaAPI-Server). It uses JSON for configuration management, and offers several features not present in the Terraria Server normally. ## :star: Quick Start @@ -38,3 +41,73 @@ Please see the contributing file before sending pull requests. * [Development Builds](https://travis.tshock.co/) * [Plugins](https://tshock.co/xf/index.php?resources/) * [Very, very old versions of TShock](https://github.com/TShock/TShock/downloads) + +## Backers + +Support us with a monthly donation and help us continue our activities. [[Become a backer](https://opencollective.com/tshock#backer)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +## Sponsors + +Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/tshock#sponsor)] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 40e3a9d5b872ea005e72e6f25bdee351226030b3 Mon Sep 17 00:00:00 2001 From: Ryozuki Date: Thu, 22 Jun 2017 21:05:14 +0200 Subject: [PATCH 2/3] fix comment typo --- TShockAPI/DB/WarpsManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs index d48ba40e..6ed72f4e 100644 --- a/TShockAPI/DB/WarpsManager.cs +++ b/TShockAPI/DB/WarpsManager.cs @@ -61,7 +61,7 @@ namespace TShockAPI.DB /// The X position. /// The Y position. /// The name. - /// Whether the opration succeeded. + /// Whether the operation succeeded. public bool Add(int x, int y, string name) { try From 6b3f18b1da7142ad23fe7fe27c93a13d6677e349 Mon Sep 17 00:00:00 2001 From: ProfessorXZ Date: Wed, 5 Jul 2017 15:09:31 +0200 Subject: [PATCH 3/3] Validate tile placement on PlaceObject, update CHANGELOG.md. Fixes #1418 --- CHANGELOG.md | 6 ++++++ TShockAPI/GetDataHandlers.cs | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa42a2aa..267c8ece 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,13 @@ This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. ## Upcoming Changes +* API: Added hooks for item, projectile and tile bans (@deadsurgeon42) +* API: New WorldGrassSpread hook which shold allow corruption/crimson/hallow creep config options to work (@DeathCradle) +* Fixed saving when one player is one the server and another one joins (@MarioE) +* Fixed /spawnmob not spawning negative IDs (@MarioE) +* Validated tile placement on PlaceObject; clients can no longer place frames, paintings etc with dirt blocks (@bartico6, @ProfessorXZ) +## TShock 4.3.24 * Updated OpenTerraria API to 1.3.5.3 (@DeathCradle) * Updated Terraria Server API to 1.3.5.3 (@WhiteXZ, @hakusaro) * Updated TShock core components to 1.3.5.3 (@hakusaro) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 2a7ddd00..77e37c03 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2350,6 +2350,15 @@ namespace TShockAPI return true; } + // This is neccessary to check in order to prevent special tiles such as + // queen bee larva, paintings etc that use this packet from being placed + // without selecting the right item. + if (type != args.TPlayer.inventory[args.TPlayer.selectedItem].createTile) + { + args.Player.SendTileSquare(x, y, 4); + return true; + } + TileObjectData tileData = TileObjectData.GetTileData(type, style, 0); if (tileData == null) return true;