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

Merge pull request #997 from NyxStudios/fix-handlespawnboss

Browse source 
Fix HandleSpawnBoss
This commit is contained in:
Lucas Nicodemus 2015-07-12 02:06:17 -06:00
commit b39a07ada0
2 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -2,6 +2,9 @@
This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large.
## TShock 4.3.5 (Unreleased)
* Fix HandleSpawnBoss, and as a result the spawnboss command and boss spawning items.
## TShock 4.3.4
* Fix invasion progress messages (@WhiteXZ)

43
TShockAPI/GetDataHandlers.cs
View file

@ -3362,8 +3362,8 @@ namespace TShockAPI
var spawnboss = false;
var invasion = false;
var plr = args.Data.ReadInt32();
var Type = args.Data.ReadInt32();
var plr = args.Data.ReadInt16();
var Type = args.Data.ReadInt16();
NPC npc = new NPC();
npc.SetDefaults(Type);
spawnboss = npc.boss;
@ -3376,23 +3376,32 @@ namespace TShockAPI
case -3:
case -4:
case -5:
case -6:
case -7:
invasion = true;
break;
case 4:
case 13:
case 35:
case 50:
case 113:
case 125:
case 126:
case 127:
case 128:
case 134:
case 222:
case 245:
case 262:
case 266:
case 370:
case 4:
case 13:
case 50:
case 126:
case 125:
case 134:
case 127:
case 128:
case 131:
case 129:
case 130:
case 222:
case 245:
case 266:
case 370:
case 75:
case 398:
case 439:
case 493:
case 507:
case 422:
case 517:
spawnboss = true;
break;
}