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

Merge branch 'general-devel' of github.com:NyxStudios/TShock into general-devel

Browse source
This commit is contained in:
Zidonuke Ghost 2013-10-01 06:22:25 -04:00
commit 262e6d8349
8 changed files with 102 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/GetDataHandlers.cs
View file

@ -1322,7 +1322,7 @@ namespace TShockAPI
args.Player.PlayerData.maxHealth = max;
}
if (args.Player.Group.HasPermission(Permissions.godmode) && (cur < max))
if (args.Player.GodMode && (cur < max))
{
args.Player.Heal(args.TPlayer.statLifeMax);
}
@ -2947,6 +2947,11 @@ namespace TShockAPI
if (TShock.Players[id] == null)
return true;
if (TShock.Players[id].GodMode)
{
TShock.Players[id].Heal(args.TPlayer.statLifeMax);
}
if (dmg > TShock.Config.MaxDamage && !args.Player.Group.HasPermission(Permissions.ignoredamagecap) && id != args.Player.Index)
{
args.Player.Disable(String.Format("Player damage exceeded {0}.", TShock.Config.MaxDamage));
@ -2983,11 +2988,6 @@ namespace TShockAPI
return true;
}
if (args.Player.Group.HasPermission(Permissions.godmode))
{
args.Player.Heal(args.TPlayer.statLifeMax);
}
return false;
}