Updated tshock for terraria 1.0.6. Removed hardcore kick for now as it needs to be fixed.
This commit is contained in:
parent
cf2f86985c
commit
8c22b3e448
3 changed files with 7 additions and 5 deletions
|
|
@ -599,7 +599,8 @@ namespace TShockAPI
|
|||
|
||||
if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50)
|
||||
{
|
||||
if (args.TPlayer.hardCore && (TShock.Config.KickOnHardcoreDeath || TShock.Config.BanOnHardcoreDeath))
|
||||
/*if (args.TPlayer.hardCore && (TShock.Config.KickOnHardcoreDeath || TShock.Config.BanOnHardcoreDeath))
|
||||
{
|
||||
if (args.TPlayer.selectedItem != 50)
|
||||
{
|
||||
if (TShock.Config.BanOnHardcoreDeath)
|
||||
|
|
@ -613,6 +614,7 @@ namespace TShockAPI
|
|||
}
|
||||
return true;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
else
|
||||
args.Player.InitSpawn = true;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace TShockAPI
|
|||
Commands.ChatCommands.Add(flush);
|
||||
#endif
|
||||
|
||||
ServerHooks.SendBytes += ServerHooks_SendBytes;
|
||||
NetHooks.SendBytes += ServerHooks_SendBytes;
|
||||
ServerHooks.SocketReset += ServerHooks_SocketReset;
|
||||
GameHooks.PostUpdate += GameHooks_Update;
|
||||
}
|
||||
|
|
@ -51,7 +51,7 @@ namespace TShockAPI
|
|||
Commands.ChatCommands.Remove(dump);
|
||||
Commands.ChatCommands.Remove(flush);
|
||||
#endif
|
||||
ServerHooks.SendBytes -= ServerHooks_SendBytes;
|
||||
NetHooks.SendBytes -= ServerHooks_SendBytes;
|
||||
ServerHooks.SocketReset -= ServerHooks_SocketReset;
|
||||
GameHooks.PostUpdate -= GameHooks_Update;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
|
|||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
|
||||
|
||||
[assembly: AssemblyVersion("3.2.1.0805")]
|
||||
[assembly: AssemblyFileVersion("3.2.1.0805")]
|
||||
[assembly: AssemblyVersion("3.2.1.0809")]
|
||||
[assembly: AssemblyFileVersion("3.2.1.0809")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue