summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-16 10:41:35 +0100
committermadmaxoft <github@xoft.cz>2013-12-16 10:41:51 +0100
commitf521cbeb31e90e4c5c25edb6686544530ddbaf99 (patch)
tree23bb2c79cfa99432976685e7fcdf06068f6a47b7 /src/Entities
parentFixed multiple player spawn broadcasts. (diff)
downloadcuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.gz
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.bz2
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.lz
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.xz
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.tar.zst
cuberite-f521cbeb31e90e4c5c25edb6686544530ddbaf99.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/Player.cpp22
-rw-r--r--src/Entities/Player.h2
2 files changed, 0 insertions, 24 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 5165c2f8a..7e7d77433 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -137,28 +137,6 @@ cPlayer::~cPlayer(void)
-bool cPlayer::Initialize(cWorld * a_World)
-{
- ASSERT(a_World != NULL);
-
- if (super::Initialize(a_World))
- {
- // Remove the client handle from the server, it will be ticked from this object from now on
- if (m_ClientHandle != NULL)
- {
- cRoot::Get()->GetServer()->ClientMovedToWorld(m_ClientHandle);
- }
-
- GetWorld()->AddPlayer(this);
- return true;
- }
- return false;
-}
-
-
-
-
-
void cPlayer::Destroyed()
{
CloseWindow(false);
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index a09f7f489..59e941040 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -41,8 +41,6 @@ public:
cPlayer(cClientHandle * a_Client, const AString & a_PlayerName);
virtual ~cPlayer();
- virtual bool Initialize(cWorld * a_World) override;
-
virtual void SpawnOn(cClientHandle & a_Client) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;