4 files changed, 28 insertions, 11 deletions

diff --git a/src/Entities/Entity.cpp b/src/Entities/Entity.cpp
index bc2b3e93e..dca44488b 100644
--- a/src/Entities/Entity.cpp
+++ b/src/Entities/Entity.cpp
@@ -1403,10 +1403,10 @@ bool cEntity::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
 		return false;
 	}
 
-	//  Ask the plugins if the entity is allowed to change the world
-	if (cRoot::Get()->GetPluginManager()->CallHookEntityChangeWorld(*this, *a_World))
+	//  Ask the plugins if the entity is allowed to changing the world
+	if (cRoot::Get()->GetPluginManager()->CallHookEntityChangingWorld(*this, *a_World))
 	{
-		// A Plugin doesn't allow the entity to change the world
+		// A Plugin doesn't allow the entity to changing the world
 		return false;
 	}
 
diff --git a/src/Entities/Minecart.h b/src/Entities/Minecart.h
index d1736e9b9..05eaf16e9 100644
--- a/src/Entities/Minecart.h
+++ b/src/Entities/Minecart.h
@@ -135,7 +135,7 @@ protected:
 	virtual void Destroyed() override;
 
 	// cItemGrid::cListener overrides:
-	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
+	virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum) override
 	{
 		UNUSED(a_SlotNum);
 		ASSERT(a_Grid == &m_Contents);
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 01ad26297..b5a48d9bf 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -128,6 +128,13 @@ cPlayer::cPlayer(cClientHandlePtr a_Client, const AString & a_PlayerName) :
 			m_IsFlying = true;
 		}
 	}
+
+	if (m_GameMode == gmSpectator)  // If player is reconnecting to the server in spectator mode
+	{
+		m_CanFly = true;
+		m_IsFlying = true;
+		m_bVisible = false;
+	}
 	
 	cRoot::Get()->GetServer()->PlayerCreated(this);
 }
@@ -1205,6 +1212,15 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
 		SetCanFly(false);
 	}
 
+	if (IsGameModeSpectator() && IsVisible())
+	{
+		SetVisible(false);
+	}
+	else if (!IsVisible())
+	{
+		SetVisible(true);
+	}
+
 	m_World->BroadcastPlayerListUpdateGameMode(*this);
 }
 
@@ -1606,9 +1622,10 @@ bool cPlayer::DoMoveToWorld(cWorld * a_World, bool a_ShouldSendRespawn)
 		return false;
 	}
 	
-	if (cRoot::Get()->GetPluginManager()->CallHookEntityChangeWorld(*this, *a_World))
+	//  Ask the plugins if the player is allowed to changing the world
+	if (cRoot::Get()->GetPluginManager()->CallHookEntityChangingWorld(*this, *a_World))
 	{
-		// A Plugin doesn't allow the player to change the world
+		// A Plugin doesn't allow the player to changing the world
 		return false;
 	}
 
diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index a0cd9b1d6..579eb8748 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -483,11 +483,11 @@ public:
 	bool PlaceBlocks(const sSetBlockVector & a_Blocks);
 
 	// cEntity overrides:
-	virtual bool IsCrouched (void) const { return m_IsCrouched; }
-	virtual bool IsSprinting(void) const { return m_IsSprinting; }
-	virtual bool IsRclking  (void) const { return IsEating() || IsChargingBow(); }
+	virtual bool IsCrouched (void) const override { return m_IsCrouched; }
+	virtual bool IsSprinting(void) const override { return m_IsSprinting; }
+	virtual bool IsRclking  (void) const override { return IsEating() || IsChargingBow(); }
 
-	virtual void Detach(void);
+	virtual void Detach(void) override;
 
 	/** Called by cClientHandle when the client is being destroyed.
 	The player removes its m_ClientHandle ownership so that the ClientHandle gets deleted. */
@@ -642,7 +642,7 @@ protected:
 	void ResolvePermissions(void);
 	void ResolveGroups(void);
 
-	virtual void Destroyed(void);
+	virtual void Destroyed(void) override;
 
 	/** Filters out damage for creative mode / friendly fire */
 	virtual bool DoTakeDamage(TakeDamageInfo & TDI) override;