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

Merge branch 'general-devel' into otapi3

Browse source
This commit is contained in:
Lucas Nicodemus 2022-04-01 01:10:00 -07:00
commit 32f2f6a33d
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -19,6 +19,13 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
## Upcoming changes ## Upcoming changes
## TShock 4.5.17
* Fixed duplicate characters (twins) after repeatedly logging in as the same character due to connection not being immediately closed during `NetHooks_NameCollision`. (@gohjoseph)
* Fixed mobs not dropping picked up coins. (@gohjoseph)
## TShock 4.5.16
* Added preliminary support for Terraria 1.4.3.6. (@SignatureBeef, @hakusaro)
## TShock 4.5.15 ## TShock 4.5.15
* Added preliminary support for Terraria 1.4.3.5. (@SignatureBeef, @hakusaro) * Added preliminary support for Terraria 1.4.3.5. (@SignatureBeef, @hakusaro)

2
TShockAPI/GetDataHandlers.cs
View file

@ -3957,7 +3957,7 @@ namespace TShockAPI
return true; return true;
} }
return true; return false;
} }
private static bool HandleKillPortal(GetDataHandlerArgs args) private static bool HandleKillPortal(GetDataHandlerArgs args)

8
TShockAPI/TShock.cs
View file

@ -59,7 +59,7 @@ namespace TShockAPI
/// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary> /// <summary>VersionNum - The version number the TerrariaAPI will return back to the API. We just use the Assembly info.</summary>
public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version; public static readonly Version VersionNum = Assembly.GetExecutingAssembly().GetName().Version;
/// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary> /// <summary>VersionCodename - The version codename is displayed when the server starts. Inspired by software codenames conventions.</summary>
public static readonly string VersionCodename = "Zelenskyy"; public static readonly string VersionCodename = "Volodymyr Oleksandrovych Zelenskyy";
/// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary> /// <summary>SavePath - This is the path TShock saves its data in. This path is relative to the TerrariaServer.exe (not in ServerPlugins).</summary>
public static string SavePath = "tshock"; public static string SavePath = "tshock";
@ -582,7 +582,7 @@ namespace TShockAPI
{ {
if (player.IP == ip) if (player.IP == ip)
{ {
Netplay.Clients[player.Index].PendingTermination = true; player.Kick("You logged in from the same IP.", true, true, null, true);
args.Handled = true; args.Handled = true;
return; return;
} }
@ -591,7 +591,7 @@ namespace TShockAPI
var ips = JsonConvert.DeserializeObject<List<string>>(player.Account.KnownIps); var ips = JsonConvert.DeserializeObject<List<string>>(player.Account.KnownIps);
if (ips.Contains(ip)) if (ips.Contains(ip))
{ {
Netplay.Clients[player.Index].PendingTermination = true; player.Kick("You logged in from another location.", true, true, null, true);
args.Handled = true; args.Handled = true;
} }
} }
@ -1340,7 +1340,7 @@ namespace TShockAPI
//Reset toggle creative powers to default, preventing potential power transfer & desync on another user occupying this slot later. //Reset toggle creative powers to default, preventing potential power transfer & desync on another user occupying this slot later.
foreach(var kv in CreativePowerManager.Instance._powersById) foreach (var kv in CreativePowerManager.Instance._powersById)
{ {
var power = kv.Value; var power = kv.Value;

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit 047baef38969ac1b8bc4b5c23a9f2fc7836f3751 Subproject commit af21743d6f1fc468daa558a402cc79d1ee314252