Merge remote-tracking branch 'upstream/master'

Conflicts:
	TShockAPI/Commands.cs
	TShockAPI/TShock.cs
	TShockAPI/Tools.cs
This commit is contained in:
ricky 2011-06-07 20:28:11 +10:00
commit c368518caa
5 changed files with 96 additions and 41 deletions

View file

@ -47,10 +47,17 @@ namespace TShockAPI
public void AddBan(string ip, string name = "", string reason = "") public void AddBan(string ip, string name = "", string reason = "")
{ {
if (GetBanByIp(ip) != null)
return;
Bans.Add(new Ban(ip, name, reason)); Bans.Add(new Ban(ip, name, reason));
SaveBans(); SaveBans();
} }
public void RemoveBan(Ban ban)
{
Bans.Remove(ban);
}
/// <summary> /// <summary>
/// Reloads the file if it was changed /// Reloads the file if it was changed
/// </summary> /// </summary>

View file

@ -51,8 +51,8 @@ namespace TShockAPI
CommandArgs args = new CommandArgs(); CommandArgs args = new CommandArgs();
args.Message = msg; args.Message = msg;
args.PlayerX = (int) ply.GetPlayer().position.X; args.PlayerX = (int)ply.GetPlayer().position.X;
args.PlayerY = (int) ply.GetPlayer().position.Y; args.PlayerY = (int)ply.GetPlayer().position.Y;
args.PlayerID = ply.GetPlayerID(); args.PlayerID = ply.GetPlayerID();
command(args); command(args);
@ -78,6 +78,8 @@ namespace TShockAPI
{ {
commands.Add(new Command("kick", "kick", Kick)); commands.Add(new Command("kick", "kick", Kick));
commands.Add(new Command("ban", "ban", Ban)); commands.Add(new Command("ban", "ban", Ban));
commands.Add(new Command("unban", "unban", UnBan));
commands.Add(new Command("unbanip", "unbanip", UnBanIP));
commands.Add(new Command("off", "maintenance", Off)); commands.Add(new Command("off", "maintenance", Off));
commands.Add(new Command("reload", "cfg", Reload)); commands.Add(new Command("reload", "cfg", Reload));
commands.Add(new Command("dropmeteor", "causeevents", DropMeteor)); commands.Add(new Command("dropmeteor", "causeevents", DropMeteor));
@ -135,14 +137,14 @@ namespace TShockAPI
} }
else else
{ {
Tools.SendMessage(args.PlayerID, "You are not in a party!", new float[]{ 255f, 240f, 20f}); Tools.SendMessage(args.PlayerID, "You are not in a party!", new float[] { 255f, 240f, 20f });
} }
} }
public static void ThirdPerson(CommandArgs args) public static void ThirdPerson(CommandArgs args)
{ {
string msg = args.Message.Remove(0, 3); string msg = args.Message.Remove(0, 3);
Tools.Broadcast("*" + Tools.FindPlayer(args.PlayerID) + " " + msg, new float[] {205, 133, 63}); Tools.Broadcast("*" + Tools.FindPlayer(args.PlayerID) + " " + msg, new float[] { 205, 133, 63 });
} }
public static void Playing(CommandArgs args) public static void Playing(CommandArgs args)
@ -159,7 +161,7 @@ namespace TShockAPI
lineOne += "BanCheater : " + ConfigurationManager.banCheater + ", "; lineOne += "BanCheater : " + ConfigurationManager.banCheater + ", ";
lineOne += "KickGriefer : " + ConfigurationManager.kickGriefer + ", "; lineOne += "KickGriefer : " + ConfigurationManager.kickGriefer + ", ";
lineOne += "BanGriefer : " + ConfigurationManager.banGriefer; lineOne += "BanGriefer : " + ConfigurationManager.banGriefer;
Tools.SendMessage(ply, lineOne, new[] {255f, 255f, 0f}); Tools.SendMessage(ply, lineOne, new[] { 255f, 255f, 0f });
string lineTwo = ""; string lineTwo = "";
lineTwo += "BanTnt : " + ConfigurationManager.banTnt + ", "; lineTwo += "BanTnt : " + ConfigurationManager.banTnt + ", ";
lineTwo += "KickTnt : " + ConfigurationManager.kickTnt + ", "; lineTwo += "KickTnt : " + ConfigurationManager.kickTnt + ", ";
@ -244,12 +246,46 @@ namespace TShockAPI
Tools.SendMessage(ply, "You can't ban another admin!", new[] { 255f, 0f, 0f }); Tools.SendMessage(ply, "You can't ban another admin!", new[] { 255f, 0f, 0f });
} }
} }
else
Tools.SendMessage(adminplr, "You can't ban another admin!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /ban <player> [reason]", Tools.SendMessage(ply, "Invalid syntax! Proper syntax: /ban <player> [reason]",
new[] { 255f, 0f, 0f }); new[] { 255f, 0f, 0f });
} }
public static void UnBan(CommandArgs args)
{
string plStr = args.Message.Remove(0, 4);
int adminplr = args.PlayerID;
var ban = TShock.Bans.GetBanByName(plStr);
if (ban != null)
{
TShock.Bans.RemoveBan(ban);
Tools.SendMessage(adminplr, string.Format("Unbanned {0} ({1})!", ban.Name, ban.IP), new[] { 255f, 0f, 0f });
}
else
{
Tools.SendMessage(adminplr, "Invalid player!", new[] { 255f, 0f, 0f });
}
}
public static void UnBanIP(CommandArgs args)
{
string plStr = args.Message.Remove(0, 4);
int adminplr = args.PlayerID;
var ban = TShock.Bans.GetBanByIp(plStr);
if (ban != null)
{
TShock.Bans.RemoveBan(ban);
Tools.SendMessage(adminplr, string.Format("Unbanned {0} ({1})!", ban.Name, ban.IP), new[] { 255f, 0f, 0f });
}
else
{
Tools.SendMessage(adminplr, "Invalid player!", new[] { 255f, 0f, 0f });
}
}
public static void Off(CommandArgs args) public static void Off(CommandArgs args)
{ {
for (int player = 0; player < Main.maxPlayers; player++) for (int player = 0; player < Main.maxPlayers; player++)
@ -285,12 +321,12 @@ namespace TShockAPI
int penis56 = 12; int penis56 = 12;
int penis57 = Main.rand.Next(Main.maxTilesX - 50) + 100; int penis57 = Main.rand.Next(Main.maxTilesX - 50) + 100;
penis57 *= 0x10; penis57 *= 0x10;
int penis58 = Main.rand.Next((int) (Main.maxTilesY*0.05))*0x10; int penis58 = Main.rand.Next((int)(Main.maxTilesY * 0.05)) * 0x10;
Vector2 vector = new Vector2(penis57, penis58); Vector2 vector = new Vector2(penis57, penis58);
float speedX = Main.rand.Next(-100, 0x65); float speedX = Main.rand.Next(-100, 0x65);
float speedY = Main.rand.Next(200) + 100; float speedY = Main.rand.Next(200) + 100;
float penis61 = (float) Math.Sqrt(((speedX*speedX) + (speedY*speedY))); float penis61 = (float)Math.Sqrt(((speedX * speedX) + (speedY * speedY)));
penis61 = (penis56)/penis61; penis61 = (penis56) / penis61;
speedX *= penis61; speedX *= penis61;
speedY *= penis61; speedY *= penis61;
Projectile.NewProjectile(vector.X, vector.Y, speedX, speedY, 12, 0x3e8, 10f, Main.myPlayer); Projectile.NewProjectile(vector.X, vector.Y, speedX, speedY, 12, 0x3e8, 10f, Main.myPlayer);
@ -312,7 +348,7 @@ namespace TShockAPI
int x = args.PlayerX; int x = args.PlayerX;
int y = args.PlayerY; int y = args.PlayerY;
int ply = args.PlayerID; int ply = args.PlayerID;
Tools.NewNPC((int) ConfigurationManager.NPCList.WORLD_EATER, x, y, ply); Tools.NewNPC((int)ConfigurationManager.NPCList.WORLD_EATER, x, y, ply);
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned an eater of worlds!"); Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned an eater of worlds!");
} }
@ -321,7 +357,7 @@ namespace TShockAPI
int x = args.PlayerX; int x = args.PlayerX;
int y = args.PlayerY; int y = args.PlayerY;
int ply = args.PlayerID; int ply = args.PlayerID;
Tools.NewNPC((int) ConfigurationManager.NPCList.EYE, x, y, ply); Tools.NewNPC((int)ConfigurationManager.NPCList.EYE, x, y, ply);
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned an eye!"); Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned an eye!");
} }
@ -330,7 +366,7 @@ namespace TShockAPI
int x = args.PlayerX; int x = args.PlayerX;
int y = args.PlayerY; int y = args.PlayerY;
int ply = args.PlayerID; int ply = args.PlayerID;
Tools.NewNPC((int) ConfigurationManager.NPCList.SKELETRON, x, y, ply); Tools.NewNPC((int)ConfigurationManager.NPCList.SKELETRON, x, y, ply);
Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned skeletron!"); Tools.Broadcast(Tools.FindPlayer(ply) + " has spawned skeletron!");
} }
@ -384,12 +420,11 @@ namespace TShockAPI
Tools.SendMessage(ply, "Teleported to your spawnpoint."); Tools.SendMessage(ply, "Teleported to your spawnpoint.");
} }
public static void Spawn(CommandArgs args) public static void Spawn(CommandArgs args)
{ {
int ply = args.PlayerID; int ply = args.PlayerID;
TShock.Teleport(ply, Main.spawnTileX*16 + 8 - Main.player[ply].width/2, TShock.Teleport(ply, Main.spawnTileX * 16 + 8 - Main.player[ply].width / 2,
Main.spawnTileY*16 - Main.player[ply].height); Main.spawnTileY * 16 - Main.player[ply].height);
Tools.SendMessage(ply, "Teleported to the map's spawnpoint."); Tools.SendMessage(ply, "Teleported to the map's spawnpoint.");
} }
@ -424,7 +459,7 @@ namespace TShockAPI
Tools.SendMessage(ply, "Teleported to " + player); Tools.SendMessage(ply, "Teleported to " + player);
} }
else else
Tools.SendMessage(ply, "Invalid player!", new[] {255f, 0f, 0f}); Tools.SendMessage(ply, "Invalid player!", new[] { 255f, 0f, 0f });
} }
public static void TPHere(CommandArgs args) public static void TPHere(CommandArgs args)
@ -438,7 +473,7 @@ namespace TShockAPI
Tools.SendMessage(ply, "You brought " + player + " here."); Tools.SendMessage(ply, "You brought " + player + " here.");
} }
else else
Tools.SendMessage(ply, "Invalid player!", new[] {255f, 0f, 0f}); Tools.SendMessage(ply, "Invalid player!", new[] { 255f, 0f, 0f });
} }
public static void SpawnMob(CommandArgs args) public static void SpawnMob(CommandArgs args)
@ -470,7 +505,7 @@ namespace TShockAPI
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /spawnmob <mob name/id> [amount]", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /spawnmob <mob name/id> [amount]",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
} }
public static void Item(CommandArgs args) public static void Item(CommandArgs args)
@ -506,14 +541,14 @@ namespace TShockAPI
} }
} }
if (!flag) if (!flag)
Tools.SendMessage(args.PlayerID, "You don't have free slots!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "You don't have free slots!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid item type!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "Invalid item type!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /item <item name/id>", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /item <item name/id>",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
} }
public static void Give(CommandArgs args) public static void Give(CommandArgs args)
@ -557,17 +592,17 @@ namespace TShockAPI
} }
} }
if (!flag) if (!flag)
Tools.SendMessage(args.PlayerID, "Player does not have free slots!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "Player does not have free slots!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid player!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid item type!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "Invalid item type!", new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /give <item type/id> <player>", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /give <item type/id> <player>",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
} }
public static void Heal(CommandArgs args) public static void Heal(CommandArgs args)
@ -583,8 +618,8 @@ namespace TShockAPI
{ {
Tools.SendMessage(ply, string.Format("You just healed {0}", (msgargs[1].TrimEnd('"')).TrimStart('"'))); Tools.SendMessage(ply, string.Format("You just healed {0}", (msgargs[1].TrimEnd('"')).TrimStart('"')));
Tools.SendMessage(player, string.Format("{0} just healed you!", Tools.FindPlayer(ply))); Tools.SendMessage(player, string.Format("{0} just healed you!", Tools.FindPlayer(ply)));
x = (int) Main.player[player].position.X; x = (int)Main.player[player].position.X;
y = (int) Main.player[player].position.Y; y = (int)Main.player[player].position.Y;
} }
else else
Tools.SendMessage(ply, "You just got healed!"); Tools.SendMessage(ply, "You just got healed!");
@ -691,21 +726,24 @@ namespace TShockAPI
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY); NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
NetMessage.syncPlayers(); NetMessage.syncPlayers();
Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " set time to night."); Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " set time to night.");
} else if (arg[1] == "dusk") }
else if (arg[1] == "dusk")
{ {
Main.dayTime = false; Main.dayTime = false;
Main.time = 0.0; Main.time = 0.0;
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY); NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
NetMessage.syncPlayers(); NetMessage.syncPlayers();
Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " set time to dusk."); Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " set time to dusk.");
} else if (arg[1] == "noon") }
else if (arg[1] == "noon")
{ {
Main.dayTime = true; Main.dayTime = true;
Main.time = 27000.0; Main.time = 27000.0;
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY); NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
NetMessage.syncPlayers(); NetMessage.syncPlayers();
Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " set time to noon."); Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " set time to noon.");
} else if (arg[1] == "midnight") }
else if (arg[1] == "midnight")
{ {
Main.dayTime = false; Main.dayTime = false;
Main.time = 16200.0; Main.time = 16200.0;
@ -715,11 +753,11 @@ namespace TShockAPI
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /time <day/night/dusk/noon/midnight>", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /time <day/night/dusk/noon/midnight>",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /time <day/night/dusk/noon/midnight>", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /time <day/night/dusk/noon/midnight>",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
} }
public static void Kill(CommandArgs args) public static void Kill(CommandArgs args)
@ -742,15 +780,15 @@ namespace TShockAPI
msgargs[i] = (msgargs[i].TrimStart('"')).TrimEnd('"'); msgargs[i] = (msgargs[i].TrimStart('"')).TrimEnd('"');
if (msgargs.Length == 1) if (msgargs.Length == 1)
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /slap <player> [dmg]", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /slap <player> [dmg]",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
else if (msgargs.Length == 2) else if (msgargs.Length == 2)
{ {
int player = Tools.FindPlayer(msgargs[1]); int player = Tools.FindPlayer(msgargs[1]);
if (player == -1) if (player == -1)
Tools.SendMessage(args.PlayerID, "Invalid player!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f });
else else
{ {
NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(1, 20)), 5, (float) 0); NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(1, 20)), 5, (float)0);
Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " slapped " + Tools.FindPlayer(player) + Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " slapped " + Tools.FindPlayer(player) +
" for 5 damage."); " for 5 damage.");
} }
@ -761,17 +799,17 @@ namespace TShockAPI
int damage = 5; int damage = 5;
int.TryParse(msgargs[2], out damage); int.TryParse(msgargs[2], out damage);
if (player == -1) if (player == -1)
Tools.SendMessage(args.PlayerID, "Invalid player!", new[] {255f, 0f, 0f}); Tools.SendMessage(args.PlayerID, "Invalid player!", new[] { 255f, 0f, 0f });
else else
{ {
NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(-1, 1)), damage, (float) 0); NetMessage.SendData(26, -1, -1, "", player, ((new Random()).Next(-1, 1)), damage, (float)0);
Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " slapped " + Tools.FindPlayer(player) + " for " + Tools.Broadcast(Tools.FindPlayer(args.PlayerID) + " slapped " + Tools.FindPlayer(player) + " for " +
damage + " damage."); damage + " damage.");
} }
} }
else else
Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /slap <player> [dmg]", Tools.SendMessage(args.PlayerID, "Invalid syntax! Proper syntax: /slap <player> [dmg]",
new[] {255f, 0f, 0f}); new[] { 255f, 0f, 0f });
} }
public static void ProtectSpawn(CommandArgs args) public static void ProtectSpawn(CommandArgs args)

View file

@ -1,6 +1,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Text;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content; using Microsoft.Xna.Framework.Content;
using Terraria; using Terraria;
@ -206,8 +207,10 @@ namespace TShockAPI
{ {
Tools.ForceKick(e.Msg.whoAmI, "You are banned: " + ban.Reason); Tools.ForceKick(e.Msg.whoAmI, "You are banned: " + ban.Reason);
e.Handled = true; e.Handled = true;
return;
} }
else if (Main.player[e.Msg.whoAmI].name.Length > 32) string name = Encoding.ASCII.GetString(e.Msg.readBuffer, e.Index + 23, (e.Length - (e.Index + 23)) + e.Index - 1);
if (name.Length > 32)
{ {
Tools.ForceKick(e.Msg.whoAmI, "Name exceeded 32 characters."); Tools.ForceKick(e.Msg.whoAmI, "Name exceeded 32 characters.");
e.Handled = true; e.Handled = true;
@ -417,6 +420,10 @@ namespace TShockAPI
byte liquid = br.ReadByte(); byte liquid = br.ReadByte();
bool lava = br.ReadBoolean(); bool lava = br.ReadBoolean();
//The liquid was picked up.
if (liquid == 0)
return;
int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16); int plyX = Math.Abs((int)Main.player[e.Msg.whoAmI].position.X / 16);
int plyY = Math.Abs((int)Main.player[e.Msg.whoAmI].position.Y / 16); int plyY = Math.Abs((int)Main.player[e.Msg.whoAmI].position.Y / 16);
int tileX = Math.Abs(x); int tileX = Math.Abs(x);
@ -610,6 +617,8 @@ namespace TShockAPI
if (Tools.HandleTntUser((int)i, "Kill tile abuse detected.")) if (Tools.HandleTntUser((int)i, "Kill tile abuse detected."))
{ {
RevertKillTile((int)i); RevertKillTile((int)i);
players[i].tileThreshold = 0;
players[i].tilesDestroyed.Clear();
} }
else if (players[i].tileThreshold > 0) else if (players[i].tileThreshold > 0)
{ {

5
TShockAPI/Tools.cs Normal file → Executable file
View file

@ -85,7 +85,6 @@ namespace TShockAPI
Log.Info("Broadcast: " + msg); Log.Info("Broadcast: " + msg);
} }
public static void Broadcast(string msg, float[] color) public static void Broadcast(string msg, float[] color)
{ {
for (int i = 0; i < Main.player.Length; i++) for (int i = 0; i < Main.player.Length; i++)
@ -227,6 +226,8 @@ namespace TShockAPI
/// <param name="reason">string reason</param> /// <param name="reason">string reason</param>
public static bool Kick(int ply, string reason, string adminUserName = "") public static bool Kick(int ply, string reason, string adminUserName = "")
{ {
if (!Main.player[ply].active)
return;
if (!TShock.players[ply].group.HasPermission("immunetokick")) if (!TShock.players[ply].group.HasPermission("immunetokick"))
{ {
string playerName = Main.player[ply].name; string playerName = Main.player[ply].name;
@ -316,7 +317,7 @@ namespace TShockAPI
{ {
string possibleColor = foo.Substring(0, 13); string possibleColor = foo.Substring(0, 13);
foo = foo.Remove(0, 13); foo = foo.Remove(0, 13);
float[] pC = {0, 0, 0}; float[] pC = { 0, 0, 0 };
possibleColor = possibleColor.Replace("%", ""); possibleColor = possibleColor.Replace("%", "");
string[] pCc = possibleColor.Split(','); string[] pCc = possibleColor.Split(',');
if (pCc.Length == 3) if (pCc.Length == 3)

View file

@ -17,5 +17,5 @@
default null default null
vip default reservedslot vip default reservedslot
newadmin default kick editspawn reservedslot newadmin default kick editspawn reservedslot
admin newadmin ban causeevents spawnboss spawnmob tp immunetokick kill admin newadmin ban unban unbanip causeevents spawnboss spawnmob tp immunetokick kill
trustedadmin admin maintenance cfg cheat pvpfun ignorecheatdetection immunetoban ignoregriefdetection trustedadmin admin maintenance cfg cheat pvpfun ignorecheatdetection immunetoban ignoregriefdetection