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

Merge commit 'eba484ff35'

Browse source
This commit is contained in:
Deathmax 2011-06-04 11:11:37 +08:00
commit 0b06bbd692
3 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/TSPlayer.cs
View file

@ -8,11 +8,12 @@ namespace TShockAPI
public class TSPlayer public class TSPlayer
{ {
public uint tileThreshold; public uint tileThreshold;
public bool syncHP = false;
public bool syncMP = false;
private int player; private int player;
private bool admin; private bool admin;
private bool adminSet; private bool adminSet;
public bool syncHP = false;
public bool syncMP = false;
public TSPlayer(int ply) public TSPlayer(int ply)
{ {

36
TShockAPI/TShock.cs
View file

@ -216,31 +216,33 @@ namespace TShockAPI
life = br.ReadInt16(); life = br.ReadInt16();
maxLife = br.ReadInt16(); maxLife = br.ReadInt16();
} }
if (players[ply].syncHP) if (maxLife > Main.player[ply].statLifeMax + 20 || life > maxLife)
{ if (players[ply].syncHP)
if (maxLife > Main.player[ply].statLifeMax + 20 || life > maxLife) {
Tools.HandleCheater(ply); if (maxLife > Main.player[ply].statLifeMax + 20 || life > maxLife)
} Tools.HandleCheater(ply);
else }
players[ply].syncHP = true; else
players[ply].syncHP = true;
} }
else if (e.MsgID == 0x2a) else if (e.MsgID == 0x2a)
{ {
byte ply; byte ply;
Int16 life, maxLife; Int16 mana, maxmana;
using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length))) using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
{ {
ply = br.ReadByte(); ply = br.ReadByte();
life = br.ReadInt16(); mana = br.ReadInt16();
maxLife = br.ReadInt16(); maxmana = br.ReadInt16();
} }
if (players[ply].syncMP) if (maxmana > Main.player[ply].statManaMax + 20 || mana > maxmana)
{ if (players[ply].syncMP)
if (maxLife > Main.player[ply].statLifeMax + 20 || life > maxLife) {
Tools.HandleCheater(ply); if (maxmana > Main.player[ply].statManaMax + 20 || mana > maxmana)
} Tools.HandleCheater(ply);
else }
players[ply].syncMP = true; else
players[ply].syncMP = true;
} }
else if (e.MsgID == 0x19) else if (e.MsgID == 0x19)
{ {

3
TShockAPI/TShockAPI.csproj
View file

@ -69,8 +69,7 @@
</PreBuildEvent> </PreBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PostBuildEvent> <PostBuildEvent>$(SolutionDir)\myass.bat</PostBuildEvent>
</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.