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

1.3.4.3 Update (API 1.26)

Browse source
This commit is contained in:
Zaicon Kiroshu 2016-11-19 17:05:08 -06:00
parent bccf2924ef
commit 50d8b0db30
7 changed files with 178 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/Commands.cs
View file

@ -30,6 +30,7 @@ using Terraria.ID;
using TShockAPI.DB;
using TerrariaApi.Server;
using TShockAPI.Hooks;
using Terraria.GameContent.Events;
namespace TShockAPI
{
@ -2053,7 +2054,7 @@ namespace TShockAPI
TSPlayer.Server.SetPumpkinMoon(true);
Main.bloodMoon = false;
NPC.waveKills = 0f;
NPC.waveCount = wave;
NPC.waveNumber = wave;
TSPlayer.All.SendInfoMessage("{0} started the pumpkin moon at wave {1}!", args.Player.Name, wave);
break;
@ -2071,7 +2072,7 @@ namespace TShockAPI
TSPlayer.Server.SetFrostMoon(true);
Main.bloodMoon = false;
NPC.waveKills = 0f;
NPC.waveCount = wave;
NPC.waveNumber = wave;
TSPlayer.All.SendInfoMessage("{0} started the frost moon at wave {1}!", args.Player.Name, wave);
break;
@ -2082,6 +2083,11 @@ namespace TShockAPI
break;
}
}
else if (DD2Event.Ongoing)
{
DD2Event.StopInvasion();
TSPlayer.All.SendInfoMessage("{0} has ended the Old One's Army event.", args.Player.Name);
}
else
{
TSPlayer.All.SendInfoMessage("{0} has ended the invasion.", args.Player.Name);