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

Merge branch 'general-devel' into journeymode_permissions

Browse source
This commit is contained in:
Patrikkk 2020-05-25 01:47:33 +02:00 • committed by GitHub
commit 1f8ae96229
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
TShockAPI/GetDataHandlers.cs
View file

@ -1923,11 +1923,14 @@ namespace TShockAPI
args.Player.TPlayer.shirtColor = shirtColor;
args.Player.TPlayer.underShirtColor = underShirtColor;
args.Player.TPlayer.shoeColor = shoeColor;
//@Olink: If you need to change bool[10], please make sure you also update the for loops below to account for it.
//There are two arrays from terraria that we only have a single array for. You will need to make sure that you are looking
//at the correct terraria array (hideVisual or hideVisual2).
args.Player.TPlayer.hideVisibleAccessory = new bool[10];
for (int i = 0; i < 8; i++)
args.Player.TPlayer.hideVisibleAccessory[i] = hideVisual[i];
for (int i = 8; i < 10; i++)
args.Player.TPlayer.hideVisibleAccessory[i] = hideVisual2[i];
for (int i = 0; i < 2; i++)
args.Player.TPlayer.hideVisibleAccessory[i+8] = hideVisual2[i];
args.Player.TPlayer.hideMisc = hideMisc;
args.Player.TPlayer.extraAccessory = extraSlot;
NetMessage.SendData((int)PacketTypes.PlayerInfo, -1, args.Player.Index, NetworkText.FromLiteral(args.Player.Name), args.Player.Index);
@ -2850,38 +2853,44 @@ namespace TShockAPI
string thing;
switch (thingType)
{
case -11:
thing = "applied advanced combat techniques";
break;
case -10:
thing = "summoned a Blood Moon";
break;
case -8:
thing = "a Moon Lord";
thing = "summoned a Moon Lord";
break;
case -7:
thing = "a Martian invasion";
thing = "summoned a Martian invasion";
break;
case -6:
thing = "an eclipse";
thing = "summoned an eclipse";
break;
case -5:
thing = "a frost moon";
thing = "summoned a frost moon";
break;
case -4:
thing = "a pumpkin moon";
thing = "summoned a pumpkin moon";
break;
case -3:
thing = "the Pirates";
thing = "summoned the Pirates";
break;
case -2:
thing = "the Snow Legion";
thing = "summoned the Snow Legion";
break;
case -1:
thing = "a Goblin Invasion";
thing = "summoned a Goblin Invasion";
break;
default:
thing = String.Format("the {0}", npc.FullName);
thing = String.Format("summoned the {0}", npc.FullName);
break;
}
if (TShock.Config.AnonymousBossInvasions)
TShock.Utils.SendLogs(string.Format("{0} summoned {1}!", args.Player.Name, thing), Color.PaleVioletRed, args.Player);
TShock.Utils.SendLogs(string.Format("{0} {1}!", args.Player.Name, thing), Color.PaleVioletRed, args.Player);
else
TShock.Utils.Broadcast(String.Format("{0} summoned {1}!", args.Player.Name, thing), 175, 75, 255);
TShock.Utils.Broadcast(String.Format("{0} {1}!", args.Player.Name, thing), 175, 75, 255);
return false;
}