diff --git a/CHANGELOG.md b/CHANGELOG.md index c101ba5e..8669a5d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 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 +* Added evil type option during world creation (@mistzzt) ## TShock 4.3.22 * Compatibility with Terraria 1.3.4.4 diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 46835113..481cb903 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -185,20 +185,22 @@ namespace TShockAPI string logFilename; string logPathSetupWarning; - OTAPI.Hooks.Net.Socket.Create = () => - { - //Console.WriteLine($"Creating socket {nameof(LinuxTcpSocket)}"); - return new LinuxTcpSocket(); - //return new OTAPI.Sockets.PoolSocket(); - //return new Terraria.Net.Sockets.TcpSocket(); - }; - OTAPI.Hooks.Player.Announce = (int playerId) => - { - //TShock handles this - return OTAPI.HookResult.Cancel; - }; + OTAPI.Hooks.Net.Socket.Create = () => + { + //Console.WriteLine($"Creating socket {nameof(LinuxTcpSocket)}"); + return new LinuxTcpSocket(); + //return new OTAPI.Sockets.PoolSocket(); + //return new Terraria.Net.Sockets.TcpSocket(); + }; + OTAPI.Hooks.Player.Announce = (int playerId) => + { + //TShock handles this + return OTAPI.HookResult.Cancel; + }; - TerrariaApi.Reporting.CrashReporter.HeapshotRequesting += CrashReporter_HeapshotRequesting; + Main.SettingsUnlock_WorldEvil = true; + + TerrariaApi.Reporting.CrashReporter.HeapshotRequesting += CrashReporter_HeapshotRequesting; try {