flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added an option to disable/enable PVP on a per world basis

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@944 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
faketruth
2012-10-10 19:46:12 +00:00
parent a038425736
commit ae5975e674
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/ClientHandle.cpp
View File

@@ -887,6 +887,15 @@ void cClientHandle::HandleUseEntity(int a_TargetEntityID, bool a_IsLeftClick)
{
virtual bool Item(cEntity * a_Entity) override
{
if (a_Entity->GetWorld()->IsPVPEnabled() == false)
{
// PVP is disabled
if (a_Entity->IsA("cPlayer") && Instigator->IsA("cPlayer"))
{
// Player is hurting another player which is not allowed when PVP is disabled so ignore it
return true;
}
}
if (a_Entity->IsA("cPawn"))
{
reinterpret_cast<cPawn *>(a_Entity)->TakeDamage(Damage, Instigator);