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

Merge pull request #1396 from mistzzt/add-evil-option

Browse source 
Add Evil Type option during world creation
This commit is contained in:
White 2017-02-17 00:50:32 +10:30 • committed by GitHub
commit b7003f0723
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -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. 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 ## Upcoming Changes
* Added evil type option during world creation (@mistzzt)
## TShock 4.3.22 ## TShock 4.3.22
* Compatibility with Terraria 1.3.4.4 * Compatibility with Terraria 1.3.4.4

28
TShockAPI/TShock.cs
View file

@ -185,20 +185,22 @@ namespace TShockAPI
string logFilename; string logFilename;
string logPathSetupWarning; string logPathSetupWarning;
OTAPI.Hooks.Net.Socket.Create = () => OTAPI.Hooks.Net.Socket.Create = () =>
{ {
//Console.WriteLine($"Creating socket {nameof(LinuxTcpSocket)}"); //Console.WriteLine($"Creating socket {nameof(LinuxTcpSocket)}");
return new LinuxTcpSocket(); return new LinuxTcpSocket();
//return new OTAPI.Sockets.PoolSocket(); //return new OTAPI.Sockets.PoolSocket();
//return new Terraria.Net.Sockets.TcpSocket(); //return new Terraria.Net.Sockets.TcpSocket();
}; };
OTAPI.Hooks.Player.Announce = (int playerId) => OTAPI.Hooks.Player.Announce = (int playerId) =>
{ {
//TShock handles this //TShock handles this
return OTAPI.HookResult.Cancel; return OTAPI.HookResult.Cancel;
}; };
TerrariaApi.Reporting.CrashReporter.HeapshotRequesting += CrashReporter_HeapshotRequesting; Main.SettingsUnlock_WorldEvil = true;
TerrariaApi.Reporting.CrashReporter.HeapshotRequesting += CrashReporter_HeapshotRequesting;
try try
{ {