From f405e7cbd63a3a5c6bcf90b6bd04e11f3bd0d388 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Tue, 1 Oct 2013 18:03:34 -0400 Subject: [PATCH 1/3] Fix boss spawn items. --- TShockAPI/GetDataHandlers.cs | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 99d5cfd0..baea2286 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -3121,8 +3121,10 @@ namespace TShockAPI var invasion = -1; var plr = args.Data.ReadInt32(); var Type = args.Data.ReadInt32(); - spawnboss = (Type == 4 || Type == 13 || (Type == 50 || Type == 125) || (Type == 126 || Type == 134 || (Type == (int) sbyte.MaxValue || Type == 128))); - if (!spawnboss) + NPC npc = new NPC(); + npc.SetDefaults(Type); + spawnboss = npc.boss; + if (!spawnboss) { switch (Type) { @@ -3158,33 +3160,9 @@ namespace TShockAPI case -1: boss = "a Goblin Invasion"; break; - case 4: - boss = "the Eye of Cthulhu"; - break; - case 13: - boss = "the Eater of Worlds"; - break; - case 50: - boss = "the King Slime"; - break; - case 125: - boss = "Retinazer"; - break; - case 126: - boss = "Spazmatism"; - break; - case 134: - boss = "the Destroyer"; - break; - case sbyte.MaxValue: - boss = "Skeleton Prime"; - break; - case 128: - boss = "Skeleton Prime"; - break; default: - boss = "error"; - break; + boss = String.Format("the {0}", npc.name); + break; } TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player); From 435029dbeb1f199b43b16e8ee8578d903fcf5bb4 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Tue, 1 Oct 2013 18:05:38 -0400 Subject: [PATCH 2/3] Fix tabs --- TShockAPI/GetDataHandlers.cs | 54 +++++++++++++++++------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index baea2286..764c9e66 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -3161,8 +3161,8 @@ namespace TShockAPI boss = "a Goblin Invasion"; break; default: - boss = String.Format("the {0}", npc.name); - break; + boss = String.Format("the {0}", npc.name); + break; } TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player); @@ -3171,36 +3171,36 @@ namespace TShockAPI private static bool HandlePaintTile(GetDataHandlerArgs args) { - var x = args.Data.ReadInt32(); - var y = args.Data.ReadInt32(); - var t = args.Data.ReadInt8(); - - if (OnPaintTile(x, y, t)) - return true; - - if (!args.Player.Group.HasPermission(Permissions.canpaint)) - { - args.Player.SendTileSquare(x, y); - return true; - } + var x = args.Data.ReadInt32(); + var y = args.Data.ReadInt32(); + var t = args.Data.ReadInt8(); + + if (OnPaintTile(x, y, t)) + return true; + + if (!args.Player.Group.HasPermission(Permissions.canpaint)) + { + args.Player.SendTileSquare(x, y); + return true; + } return false; } private static bool HandlePaintWall(GetDataHandlerArgs args) { - var x = args.Data.ReadInt32(); - var y = args.Data.ReadInt32(); - var t = args.Data.ReadInt8(); + var x = args.Data.ReadInt32(); + var y = args.Data.ReadInt32(); + var t = args.Data.ReadInt8(); - if (OnPaintTile(x, y, t)) - return true; + if (OnPaintTile(x, y, t)) + return true; - if (!args.Player.Group.HasPermission(Permissions.canpaint)) - { - args.Player.SendTileSquare(x, y); - return true; - } + if (!args.Player.Group.HasPermission(Permissions.canpaint)) + { + args.Player.SendTileSquare(x, y); + return true; + } return false; } @@ -3215,11 +3215,7 @@ namespace TShockAPI return true; byte style = 0; - var isNPC = false; - if ((flag & 1) == 1) - { - isNPC = true; - } + var isNPC = false || (flag & 1) == 1; if ((flag & 2) != 2) { From 3402940b31ace77a0b8f05b72ba7930979f79706 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Tue, 1 Oct 2013 18:07:20 -0400 Subject: [PATCH 3/3] For all things holy, spaces be gone. --- TShockAPI/GetDataHandlers.cs | 84 ++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 764c9e66..e4fcdfc3 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -3117,56 +3117,56 @@ namespace TShockAPI private static bool HandleSpawnBoss(GetDataHandlerArgs args) { - var spawnboss = false; - var invasion = -1; - var plr = args.Data.ReadInt32(); - var Type = args.Data.ReadInt32(); + var spawnboss = false; + var invasion = -1; + var plr = args.Data.ReadInt32(); + var Type = args.Data.ReadInt32(); NPC npc = new NPC(); npc.SetDefaults(Type); spawnboss = npc.boss; if (!spawnboss) - { - switch (Type) - { - case -1: - invasion = 1; - break; - case -2: - invasion = 2; - break; - } - } - if (spawnboss && !args.Player.Group.HasPermission(Permissions.summonboss)) - { - args.Player.SendMessage("You don't have permission to summon a boss.", Color.Red); - return true; - } - if (invasion != -1 && !args.Player.Group.HasPermission(Permissions.startinvasion)) - { - args.Player.SendMessage("You don't have permission to start an invasion.", Color.Red); - return true; - } - if (!spawnboss && invasion == -1) - return true; - if (plr != args.Player.Index) - return true; + { + switch (Type) + { + case -1: + invasion = 1; + break; + case -2: + invasion = 2; + break; + } + } + if (spawnboss && !args.Player.Group.HasPermission(Permissions.summonboss)) + { + args.Player.SendMessage("You don't have permission to summon a boss.", Color.Red); + return true; + } + if (invasion != -1 && !args.Player.Group.HasPermission(Permissions.startinvasion)) + { + args.Player.SendMessage("You don't have permission to start an invasion.", Color.Red); + return true; + } + if (!spawnboss && invasion == -1) + return true; + if (plr != args.Player.Index) + return true; - string boss; - switch (Type) - { - case -2: - boss = "the Snow Legion"; - break; - case -1: - boss = "a Goblin Invasion"; - break; - default: + string boss; + switch (Type) + { + case -2: + boss = "the Snow Legion"; + break; + case -1: + boss = "a Goblin Invasion"; + break; + default: boss = String.Format("the {0}", npc.name); break; - } + } - TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player); - return false; + TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player); + return false; } private static bool HandlePaintTile(GetDataHandlerArgs args)