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

Add fixes for mana and health updates

Browse source
This commit is contained in:
Zack Piispanen 2013-10-02 01:30:38 -04:00
parent 1ffd8f82a9
commit 48e1db012c
2 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

38
TShockAPI/GetDataHandlers.cs
View file

@ -1319,6 +1319,8 @@ namespace TShockAPI
if (args.Player.IsLoggedIn) if (args.Player.IsLoggedIn)
{ {
args.Player.TPlayer.statLife = cur;
args.Player.TPlayer.statLifeMax = max;
args.Player.PlayerData.maxHealth = max; args.Player.PlayerData.maxHealth = max;
} }
@ -1348,6 +1350,13 @@ namespace TShockAPI
return false; return false;
} }
if (args.Player.IsLoggedIn)
{
args.Player.TPlayer.statMana = cur;
args.Player.TPlayer.statManaMax = max;
args.Player.PlayerData.maxMana = max;
}
return false; return false;
} }
@ -2294,6 +2303,25 @@ namespace TShockAPI
string.Format("You cannot use {0} on this server. Your actions are being ignored.", string.Format("You cannot use {0} on this server. Your actions are being ignored.",
args.TPlayer.inventory[item].name), Color.Red); args.TPlayer.inventory[item].name), Color.Red);
} }
if (args.TPlayer.inventory[item].name == "Mana Crystal" && args.Player.PlayerData.maxMana <= 180)
{
args.Player.TPlayer.statMana += 20;
args.Player.TPlayer.statManaMax += 20;
args.Player.PlayerData.maxMana += 20;
}
else if (args.TPlayer.inventory[item].name == "Life Crystal" && args.Player.PlayerData.maxHealth <= 380)
{
args.TPlayer.statLife += 20;
args.TPlayer.statLifeMax += 20;
args.Player.PlayerData.maxHealth += 20;
}
else if (args.TPlayer.inventory[item].name == "Life Fruit" && args.Player.PlayerData.maxHealth >= 400)
{
args.TPlayer.statLife += 5;
args.TPlayer.statLifeMax += 5;
args.Player.PlayerData.maxHealth += 5;
}
} }
args.TPlayer.selectedItem = item; args.TPlayer.selectedItem = item;
@ -2947,11 +2975,6 @@ namespace TShockAPI
if (TShock.Players[id] == null) if (TShock.Players[id] == null)
return true; 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) 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)); args.Player.Disable(String.Format("Player damage exceeded {0}.", TShock.Config.MaxDamage));
@ -2988,6 +3011,11 @@ namespace TShockAPI
return true; return true;
} }
if (TShock.Players[id].GodMode)
{
TShock.Players[id].Heal(args.TPlayer.statLifeMax);
}
return false; return false;
} }

2
TShockAPI/TSPlayer.cs
View file

@ -1146,7 +1146,7 @@ namespace TShockAPI
{ {
player.TPlayer.statLife = this.health; player.TPlayer.statLife = this.health;
player.TPlayer.statLifeMax = this.maxHealth; player.TPlayer.statLifeMax = this.maxHealth;
player.TPlayer.statMana = this.mana; player.TPlayer.statMana = this.maxMana;
player.TPlayer.statManaMax = this.maxMana; player.TPlayer.statManaMax = this.maxMana;
for (int i = 0; i < NetItem.maxNetInventory; i++) for (int i = 0; i < NetItem.maxNetInventory; i++)
{ {