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

Fixed bug where PvP would always stay on even if perma PvP was off.

Browse source
This commit is contained in:
Deathmax 2011-06-04 10:59:16 +08:00
parent efe8b3ce4f
commit 50430ce9a7
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
TShockAPI/TShock.cs
View file

@ -112,9 +112,15 @@ namespace TShockAPI
NetHooks.OnPreGetData += GetData; NetHooks.OnPreGetData += GetData;
NetHooks.OnGreetPlayer += new NetHooks.GreetPlayerD(OnGreetPlayer); NetHooks.OnGreetPlayer += new NetHooks.GreetPlayerD(OnGreetPlayer);
NpcHooks.OnStrikeNpc += new NpcHooks.StrikeNpcD(NpcHooks_OnStrikeNpc); NpcHooks.OnStrikeNpc += new NpcHooks.StrikeNpcD(NpcHooks_OnStrikeNpc);
ServerHooks.OnCommand += new ServerHooks.CommandD(ServerHooks_OnCommand);
Commands.InitCommands(); Commands.InitCommands();
} }
void ServerHooks_OnCommand(string cmd, HandledEventArgs e)
{
}
public override void DeInitialize() public override void DeInitialize()
{ {
GameHooks.OnPreInitialize -= OnPreInit; GameHooks.OnPreInitialize -= OnPreInit;
@ -164,7 +170,18 @@ namespace TShockAPI
} }
else if (e.MsgID == 0x1e) else if (e.MsgID == 0x1e)
{ {
Main.player[e.Msg.whoAmI].hostile = true; byte id;
bool pvp;
using (var br = new BinaryReader(new MemoryStream(e.Msg.readBuffer, e.Index, e.Length)))
{
id = br.ReadByte();
pvp = br.ReadBoolean();
}
Main.player[e.Msg.whoAmI].hostile = pvp;
if (id != e.Msg.whoAmI)
Main.player[e.Msg.whoAmI].hostile = true;
if (ConfigurationManager.permaPvp)
Main.player[e.Msg.whoAmI].hostile = true;
NetMessage.SendData(30, -1, -1, "", e.Msg.whoAmI); NetMessage.SendData(30, -1, -1, "", e.Msg.whoAmI);
e.Handled = true; e.Handled = true;
} }
@ -574,11 +591,11 @@ namespace TShockAPI
public static bool CheckInventory(int plr) public static bool CheckInventory(int plr)
{ {
/*for (int i = 0; i < 44; i++) for (int i = 0; i < 44; i++)
{ {
if (Main.player[plr].inventory[i].stack > Main.player[plr].inventory[i].maxStack) if (Main.player[plr].inventory[i].stack > Main.player[plr].inventory[i].maxStack)
return true; return true;
}*/ }
return false; return false;
} }
} }