From 0b99aceeb97c3d337db4d82b55c295880917c4d3 Mon Sep 17 00:00:00 2001 From: Enerdy Date: Sat, 18 Jul 2015 21:30:16 +0100 Subject: [PATCH 1/8] Add projectile 465 to list of projectile ignores, fix another previously added ignore. --- TShockAPI/GetDataHandlers.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 4b0a025b..b8910c7e 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2622,9 +2622,10 @@ namespace TShockAPI || type == ProjectileID.DeathLaser || type == ProjectileID.Landmine || type == ProjectileID.BulletDeadeye || type == ProjectileID.BoulderStaffOfEarth || (type > ProjectileID.ConfettiMelee && type < ProjectileID.SpiritHeal) - || (type >= ProjectileID.FlamingWood && ProjectileID.GreekFire3 <= 328) + || (type >= ProjectileID.FlamingWood && type <= ProjectileID.GreekFire3) || (type >= ProjectileID.PineNeedleHostile && type <= ProjectileID.Spike) - || (type >= ProjectileID.MartianTurretBolt && type <= ProjectileID.RayGunnerLaser)) + || (type >= ProjectileID.MartianTurretBolt && type <= ProjectileID.RayGunnerLaser) + || type == ProjectileID.CultistBossLightningOrb) { TShock.Log.Debug("Certain projectiles have been ignored for cheat detection."); } From ff78bf6b44d9690e87ee0c49990c02536e58b342 Mon Sep 17 00:00:00 2001 From: Enerdy Date: Mon, 20 Jul 2015 00:29:40 +0100 Subject: [PATCH 2/8] Update Submodule --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index d214ce68..9842df3f 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit d214ce684197ca6f1b32bacea928962fdd0ac20b +Subproject commit 9842df3f13e2cb973889484129a58dbfef1bd139 From 344149893d2fa7050e306900aadeb1333e3e0e38 Mon Sep 17 00:00:00 2001 From: White Date: Mon, 20 Jul 2015 19:13:55 +0930 Subject: [PATCH 3/8] Updated submodule --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index 9842df3f..7170d8c4 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit 9842df3f13e2cb973889484129a58dbfef1bd139 +Subproject commit 7170d8c4965b2c03391cf7e0a45ae1f0c6ad5945 From dfc28c8522cf78a2f52e267c4509ef022218fe6c Mon Sep 17 00:00:00 2001 From: White Date: Mon, 20 Jul 2015 21:41:53 +0930 Subject: [PATCH 4/8] Updated submodule --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index 7170d8c4..bdf19b64 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit 7170d8c4965b2c03391cf7e0a45ae1f0c6ad5945 +Subproject commit bdf19b6438fc86d8824187cd1d535316722569bb From 4371ad4d9a0c9a9b7d91884630ccdf78423c941a Mon Sep 17 00:00:00 2001 From: White Date: Mon, 20 Jul 2015 23:25:33 +0930 Subject: [PATCH 5/8] Logging out is now safe in SSC. Fixes #1037 --- TShockAPI/Commands.cs | 15 +++++++++++++++ TShockAPI/TShock.cs | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 673efc69..96af5129 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -862,6 +862,17 @@ namespace TShockAPI PlayerHooks.OnPlayerLogout(args.Player); + + if (Main.ServerSideCharacter) + { + args.Player.IgnoreActionsForInventory = String.Format("Server side characters is enabled! Please {0}register or {0}login to play!", Commands.Specifier); + if (!args.Player.IgnoreActionsForClearingTrashCan && (!args.Player.Dead || args.Player.TPlayer.difficulty != 2)) + { + args.Player.PlayerData.CopyCharacter(args.Player); + TShock.CharacterDB.InsertPlayerData(args.Player); + } + } + args.Player.PlayerData = new PlayerData(args.Player); args.Player.Group = TShock.Groups.GetGroupByName(TShock.Config.DefaultGuestGroupName); args.Player.tempGroup = null; @@ -873,6 +884,10 @@ namespace TShockAPI args.Player.IsLoggedIn = false; args.Player.SendSuccessMessage("You have been successfully logged out of your account."); + if (Main.ServerSideCharacter) + { + args.Player.SendWarningMessage("Server side characters are enabled. You need to be logged in to play."); + } } private static void PasswordUser(CommandArgs args) diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index d6f141d1..5247b0da 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -988,7 +988,7 @@ namespace TShockAPI player.IgnoreActionsForDisabledArmor = check; if (CheckIgnores(player)) { - player.Disable("check ignores failed in SecondUpdate()", false); + player.Disable("check ignores failed in OnSecondUpdate()", false); } else if (Itembans.ItemIsBanned(player.TPlayer.inventory[player.TPlayer.selectedItem].name, player)) { From fb2cd670faf322e16b0685cb393cffc64b951873 Mon Sep 17 00:00:00 2001 From: Enerdy Date: Mon, 20 Jul 2015 23:05:35 +0100 Subject: [PATCH 6/8] Update submodule (now on 1.3.0.6) --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index bdf19b64..e9c03b05 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit bdf19b6438fc86d8824187cd1d535316722569bb +Subproject commit e9c03b0572edebe903d0e7be9d9601344f4b64d1 From f6f2ebdd96f6acde4a4b3d42970c66d8cfdbc33d Mon Sep 17 00:00:00 2001 From: Enerdy Date: Tue, 21 Jul 2015 16:16:32 +0100 Subject: [PATCH 7/8] Update Submodule --- TerrariaServerAPI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TerrariaServerAPI b/TerrariaServerAPI index e9c03b05..fe600ac0 160000 --- a/TerrariaServerAPI +++ b/TerrariaServerAPI @@ -1 +1 @@ -Subproject commit e9c03b0572edebe903d0e7be9d9601344f4b64d1 +Subproject commit fe600ac0d9d799e4b22d95983cc9dbd1669346c5 From 7717f6d9d5d7887aa928cfb4a1e868f8899ce13f Mon Sep 17 00:00:00 2001 From: Tyler Watson Date: Thu, 23 Jul 2015 18:41:18 +1000 Subject: [PATCH 8/8] Removed -world handling from inside TShock Seriously, when has it ever been a good idea to handle TSAPI commandline mechanisms from a plugin? TSAPI related command line parameters need to be handled from inside TSAPI. --- TShockAPI/TShock.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 5247b0da..c0a8fbe2 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -602,14 +602,6 @@ namespace TShockAPI throw new InvalidOperationException("Invalid value given for command line argument \"-ip\"."); } - break; - } - case "-world": - { - string worldPath = parms[++i]; - Main.instance.SetWorld(worldPath);; - ServerApi.LogWriter.PluginWriteLine(this, string.Format("World set for auto loading: {0}", worldPath), TraceLevel.Verbose); - break; } case "-worldname":