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

Make Kick/BanOnMediumcoreDeath behave like their Hardcore equvivalents

Browse source 
fixes #1618
This commit is contained in:
Egor 2018-04-27 05:44:22 +03:00
parent 691aa043a9
commit 9ac3dfa228
2 changed files with 14 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -81,6 +81,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
* `Utils.GetIPv4Address()` is now `Utils.GetIPv4AddressFromHostname()`. (@hakusaro) * `Utils.GetIPv4Address()` is now `Utils.GetIPv4AddressFromHostname()`. (@hakusaro)
* Fixed the disappearing problem when placing tile entities. (@mistzzt) * Fixed the disappearing problem when placing tile entities. (@mistzzt)
* Removed the stat tracking system. (@hakusaro) * Removed the stat tracking system. (@hakusaro)
* Fixed erroneous kicks and bans when using `KickOnMediumcoreDeath` and `BanOnMediumcoreDeath` options. (@DankRank)
## TShock 4.3.25 ## TShock 4.3.25
* Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6. * Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.

41
TShockAPI/GetDataHandlers.cs
View file

@ -2380,16 +2380,21 @@ namespace TShockAPI
} }
} }
if (args.TPlayer.difficulty == 2 && (TShock.Config.KickOnHardcoreDeath || TShock.Config.BanOnHardcoreDeath)) if (args.TPlayer.difficulty != 0)
{ {
if (TShock.Config.BanOnHardcoreDeath) bool mediumcore = args.TPlayer.difficulty == 1;
{ bool shouldBan = mediumcore ? TShock.Config.BanOnMediumcoreDeath : TShock.Config.BanOnHardcoreDeath;
if (!args.Player.Ban(TShock.Config.HardcoreBanReason, false, "hardcore-death")) bool shouldKick = mediumcore ? TShock.Config.KickOnMediumcoreDeath : TShock.Config.KickOnHardcoreDeath;
string banReason = mediumcore ? TShock.Config.MediumcoreBanReason : TShock.Config.HardcoreBanReason;
string kickReason = mediumcore ? TShock.Config.MediumcoreKickReason : TShock.Config.HardcoreKickReason;
string banAdminName = mediumcore ? "mediumcore-death" : "hardcore-death";
if(shouldBan) {
if (!args.Player.Ban(banReason, false, banAdminName))
args.Player.Kick("You died! Normally, you'd be banned.", true, true); args.Player.Kick("You died! Normally, you'd be banned.", true, true);
} }
else else if(shouldKick) {
{ args.Player.Kick(kickReason, true, true, null, false);
args.Player.Kick(TShock.Config.HardcoreKickReason, true, true, null, false);
} }
} }
@ -2440,27 +2445,7 @@ namespace TShockAPI
if (OnPlayerSpawn(args.Player, args.Data, player, spawnx, spawny)) if (OnPlayerSpawn(args.Player, args.Data, player, spawnx, spawny))
return true; return true;
if (args.Player.InitSpawn && args.TPlayer.inventory[args.TPlayer.selectedItem].type != 50) args.Player.InitSpawn = true;
{
if (args.TPlayer.difficulty == 1 && (TShock.Config.KickOnMediumcoreDeath || TShock.Config.BanOnMediumcoreDeath))
{
if (args.TPlayer.selectedItem != 50)
{
if (TShock.Config.BanOnMediumcoreDeath)
{
if (!args.Player.Ban(TShock.Config.MediumcoreBanReason, false, "mediumcore-death"))
args.Player.Kick("You died! Normally, you'd be banned.", true, true);
}
else
{
args.Player.Kick(TShock.Config.MediumcoreKickReason, true, true, null, false);
}
return true;
}
}
}
else
args.Player.InitSpawn = true;
if ((Main.ServerSideCharacter) && (args.Player.sX > 0) && (args.Player.sY > 0) && (args.TPlayer.SpawnX > 0) && ((args.TPlayer.SpawnX != args.Player.sX) && (args.TPlayer.SpawnY != args.Player.sY))) if ((Main.ServerSideCharacter) && (args.Player.sX > 0) && (args.Player.sY > 0) && (args.TPlayer.SpawnX > 0) && ((args.TPlayer.SpawnX != args.Player.sX) && (args.TPlayer.SpawnY != args.Player.sY)))
{ {