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

Fix SSC god mode?

Browse source
This commit is contained in:
Zack Piispanen 2013-10-01 21:06:13 -04:00
parent 9304c128b0
commit e7a013b83f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TShockAPI/GetDataHandlers.cs
View file

@ -976,18 +976,18 @@ namespace TShockAPI
/// <summary> /// <summary>
/// If the player has PVP on /// If the player has PVP on
/// </summary> /// </summary>
public byte PVP { get; set; } public bool PVP { get; set; }
/// <summary> /// <summary>
/// Is the damage critical? /// Is the damage critical?
/// </summary> /// </summary>
public byte Critical { get; set; } public bool Critical { get; set; }
} }
/// <summary> /// <summary>
/// PlayerDamage - Called when a player is damaged /// PlayerDamage - Called when a player is damaged
/// </summary> /// </summary>
public static HandlerList<PlayerDamageEventArgs> PlayerDamage; public static HandlerList<PlayerDamageEventArgs> PlayerDamage;
private static bool OnPlayerDamage(byte id, byte dir, short dmg, byte pvp, byte crit) private static bool OnPlayerDamage(byte id, byte dir, short dmg, bool pvp, bool crit)
{ {
if (PlayerDamage == null) if (PlayerDamage == null)
return false; return false;
@ -2927,8 +2927,8 @@ namespace TShockAPI
var id = args.Data.ReadInt8(); var id = args.Data.ReadInt8();
var direction = args.Data.ReadInt8(); var direction = args.Data.ReadInt8();
var dmg = args.Data.ReadInt16(); var dmg = args.Data.ReadInt16();
var pvp = args.Data.ReadInt8(); var pvp = args.Data.ReadBoolean();
var crit = args.Data.ReadInt8(); var crit = args.Data.ReadBoolean();
if (OnPlayerDamage(id, direction, dmg, pvp, crit)) if (OnPlayerDamage(id, direction, dmg, pvp, crit))
return true; return true;
@ -2960,7 +2960,7 @@ namespace TShockAPI
return true; return true;
} }
if (!TShock.Players[id].TPlayer.hostile) if (!TShock.Players[id].TPlayer.hostile && pvp)
{ {
args.Player.SendData(PacketTypes.PlayerHp, "", id); args.Player.SendData(PacketTypes.PlayerHp, "", id);
args.Player.SendData(PacketTypes.PlayerUpdate, "", id); args.Player.SendData(PacketTypes.PlayerUpdate, "", id);