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

Merge remote branch 'origin' into general-devel

Browse source
This commit is contained in:
k0rd 2013-10-02 22:19:36 -04:00
commit 483744a2da
1 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
TShockAPI/GetDataHandlers.cs
View file

@ -2237,11 +2237,6 @@ namespace TShockAPI
return true; return true;
} }
if (pulley > 2)
{
return true;
}
if (args.Player.LastNetPosition == Vector2.Zero) if (args.Player.LastNetPosition == Vector2.Zero)
{ {
return true; return true;
@ -3170,7 +3165,7 @@ namespace TShockAPI
private static bool HandleSpawnBoss(GetDataHandlerArgs args) private static bool HandleSpawnBoss(GetDataHandlerArgs args)
{ {
var spawnboss = false; var spawnboss = false;
var invasion = -1; var invasion = false;
var plr = args.Data.ReadInt32(); var plr = args.Data.ReadInt32();
var Type = args.Data.ReadInt32(); var Type = args.Data.ReadInt32();
NPC npc = new NPC(); NPC npc = new NPC();
@ -3181,10 +3176,9 @@ namespace TShockAPI
switch (Type) switch (Type)
{ {
case -1: case -1:
invasion = 1;
break;
case -2: case -2:
invasion = 2; case -3:
invasion = true;
break; break;
} }
} }
@ -3193,19 +3187,23 @@ namespace TShockAPI
args.Player.SendMessage("You don't have permission to summon a boss.", Color.Red); args.Player.SendMessage("You don't have permission to summon a boss.", Color.Red);
return true; return true;
} }
if (invasion != -1 && !args.Player.Group.HasPermission(Permissions.startinvasion)) if (invasion && !args.Player.Group.HasPermission(Permissions.startinvasion))
{ {
args.Player.SendMessage("You don't have permission to start an invasion.", Color.Red); args.Player.SendMessage("You don't have permission to start an invasion.", Color.Red);
return true; return true;
} }
if (!spawnboss && invasion == -1) if (!spawnboss && !invasion)
return true; return true;
if (plr != args.Player.Index) if (plr != args.Player.Index)
return true; return true;
string boss; string boss;
switch (Type) switch (Type)
{ {
case -3:
boss = "the pirates";
break;
case -2: case -2:
boss = "the Snow Legion"; boss = "the Snow Legion";
break; break;
@ -3217,7 +3215,7 @@ namespace TShockAPI
break; break;
} }
TShock.Utils.SendLogs(string.Format("{0} summoned {1}", args.Player.Name, boss), Color.PaleVioletRed, args.Player); TShock.Utils.SendLogs(string.Format("{0} summoned {1}.", args.Player.Name, boss), Color.PaleVioletRed, args.Player);
return false; return false;
} }