From 88270be66928f3b73b73fc1f3b26a74358089223 Mon Sep 17 00:00:00 2001 From: "admin@omencraft.com" Date: Wed, 26 Oct 2011 20:52:19 +0000 Subject: Made several recomended changes. Gamemode is now world based. Need to add it to player. git-svn-id: http://mc-server.googlecode.com/svn/trunk@18 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPlayer.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source/cPlayer.cpp') diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp index 21c08fc5a..2f7e27988 100644 --- a/source/cPlayer.cpp +++ b/source/cPlayer.cpp @@ -317,7 +317,7 @@ void cPlayer::Heal( int a_Health ) void cPlayer::TakeDamage( int a_Damage, cEntity* a_Instigator ) { - if ( !(cPacket::GAMEMODE == 1) ) { + if ( !(cRoot::Get()->GetWorld()->GetGameMode() == 1) ) { cPawn::TakeDamage( a_Damage, a_Instigator ); cPacket_UpdateHealth Health; @@ -356,7 +356,12 @@ void cPlayer::Respawn() m_Health = 20; cWorld* World = cRoot::Get()->GetWorld(); - m_ClientHandle->Send( cPacket_Respawn() ); + // Create Respawn player packet + cPacket_Respawn Packet; + //Set Gamemode for packet by looking at world's gamemode (Need to check players gamemode.) + Packet.m_CreativeMode = cRoot::Get()->GetWorld()->GetGameMode(); + //Send Packet + m_ClientHandle->Send( Packet ); TeleportTo( World->GetSpawnX(), World->GetSpawnY(), World->GetSpawnZ() ); SetVisible( true ); } -- cgit v1.2.3