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

Merge branch 'general-devel' into player-data

Browse source
This commit is contained in:
Chris 2019-03-30 13:58:19 +10:30 • committed by GitHub
commit 9b75342bff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Bouncer.cs
View file

@ -1869,7 +1869,9 @@ namespace TShockAPI
{ BuffID.DryadsWardDebuff, 120 },
{ BuffID.Daybreak, 300 },
{ BuffID.BetsysCurse, 600 },
{ BuffID.Oiled, 540 }
{ BuffID.Oiled, 540 },
{ BuffID.Confused, 360 }, // Brain of Confusion Internal Item ID: 3223
{ BuffID.Daybreak, 300 } // Solar Eruption Item ID: 3473, Daybreak Item ID: 3543
};
/// <summary>

2
TShockAPI/TShock.cs
View file

@ -1130,6 +1130,8 @@ namespace TShockAPI
}
if (check != "none")
player.IsDisabledForBannedWearable = true;
else
player.IsDisabledForBannedWearable = false;
if (player.IsBeingDisabled())
{