ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Save last gamemode 

git-svn-id: http://mc-server.googlecode.com/svn/trunk@660 0a769ca7-a7f5-676a-18bf-c427514a06d6
master
lapayo94@gmail.com 2012-07-12 20:55:29 +00:00
parent a7d72ac70f
commit 6c5a42737f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/cClientHandle.cpp
View File

@ -307,7 +307,7 @@ void cClientHandle::Authenticate(void)
World = cRoot::Get()->GetDefaultWorld(); World = cRoot::Get()->GetDefaultWorld();
} }
m_Player->LoginSetGameMode (World->GetGameMode()); //set player's gamemode to server's gamemode at login. TODO: set to last player's gamemode at logout // We don´t need this, do we? m_Player->LoginSetGameMode (World->GetGameMode()); //set player's gamemode to server's gamemode at login. TODO: set to last player's gamemode at logout
m_Player->SetIP (m_Socket.GetIPString()); m_Player->SetIP (m_Socket.GetIPString());
@ -909,6 +909,14 @@ void cClientHandle::HandleBlockDig(cPacket_BlockDig * a_Packet)
void cClientHandle::HandleBlockPlace(cPacket_BlockPlace * a_Packet) void cClientHandle::HandleBlockPlace(cPacket_BlockPlace * a_Packet)
{ {
if(a_Packet->m_PosX == -1
&& a_Packet->m_PosY == 255
&& a_Packet->m_PosZ == -1)
{
//I don´t know whats the idea behind these packets O.o
return;
}
if (!CheckBlockInteractionsRate()) if (!CheckBlockInteractionsRate())
{ {
return; return;

2
source/cPlayer.cpp
View File

@ -915,6 +915,7 @@ bool cPlayer::LoadFromDisk()
m_Health = (short)root.get("health", 0 ).asInt(); m_Health = (short)root.get("health", 0 ).asInt();
m_FoodLevel = (short)root.get("food", 0 ).asInt(); m_FoodLevel = (short)root.get("food", 0 ).asInt();
m_GameMode = (eGameMode) root.get("gamemode", cRoot::Get()->GetDefaultWorld()->GetGameMode()).asInt();
m_Inventory->LoadFromJson(root["inventory"]); m_Inventory->LoadFromJson(root["inventory"]);
m_CreativeInventory->LoadFromJson(root["creativeinventory"]); m_CreativeInventory->LoadFromJson(root["creativeinventory"]);
@ -960,6 +961,7 @@ bool cPlayer::SaveToDisk()
root["health"] = m_Health; root["health"] = m_Health;
root["food"] = m_FoodLevel; root["food"] = m_FoodLevel;
root["world"] = GetWorld()->GetName(); root["world"] = GetWorld()->GetName();
root["gamemode"] = (int) m_GameMode;
Json::StyledWriter writer; Json::StyledWriter writer;
std::string JsonData = writer.write( root ); std::string JsonData = writer.write( root );