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

Updated tshock for terraria 1.0.6. Removed hardcore kick for now as it needs to be fixed.

Browse source
This commit is contained in:
high 2011-08-09 18:15:47 -04:00
parent cf2f86985c
commit 8c22b3e448
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/GetDataHandlers.cs
View file

@ -599,7 +599,8 @@ namespace TShockAPI
if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50) 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 (args.TPlayer.selectedItem != 50)
{ {
if (TShock.Config.BanOnHardcoreDeath) if (TShock.Config.BanOnHardcoreDeath)
@ -613,6 +614,7 @@ namespace TShockAPI
} }
return true; return true;
} }
}*/
} }
else else
args.Player.InitSpawn = true; args.Player.InitSpawn = true;

4
TShockAPI/PacketBufferer.cs
View file

@ -40,7 +40,7 @@ namespace TShockAPI
Commands.ChatCommands.Add(flush); Commands.ChatCommands.Add(flush);
#endif #endif
ServerHooks.SendBytes += ServerHooks_SendBytes; NetHooks.SendBytes += ServerHooks_SendBytes;
ServerHooks.SocketReset += ServerHooks_SocketReset; ServerHooks.SocketReset += ServerHooks_SocketReset;
GameHooks.PostUpdate += GameHooks_Update; GameHooks.PostUpdate += GameHooks_Update;
} }
@ -51,7 +51,7 @@ namespace TShockAPI
Commands.ChatCommands.Remove(dump); Commands.ChatCommands.Remove(dump);
Commands.ChatCommands.Remove(flush); Commands.ChatCommands.Remove(flush);
#endif #endif
ServerHooks.SendBytes -= ServerHooks_SendBytes; NetHooks.SendBytes -= ServerHooks_SendBytes;
ServerHooks.SocketReset -= ServerHooks_SocketReset; ServerHooks.SocketReset -= ServerHooks_SocketReset;
GameHooks.PostUpdate -= GameHooks_Update; GameHooks.PostUpdate -= GameHooks_Update;
} }

4
TShockAPI/Properties/AssemblyInfo.cs
View file

@ -36,5 +36,5 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.2.1.0805")] [assembly: AssemblyVersion("3.2.1.0809")]
[assembly: AssemblyFileVersion("3.2.1.0805")] [assembly: AssemblyFileVersion("3.2.1.0809")]