2 files changed, 0 insertions, 36 deletions

diff --git a/src/server.cpp b/src/server.cpp
index 11ffba343..540d23b9d 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -184,9 +184,7 @@ Server::Server(
 {
 	m_liquid_transform_timer = 0.0;
 	m_liquid_transform_every = 1.0;
-	m_print_info_timer = 0.0;
 	m_masterserver_timer = 0.0;
-	m_objectdata_timer = 0.0;
 	m_emergethread_trigger_timer = 0.0;
 	m_savemap_timer = 0.0;
 
@@ -3211,12 +3209,6 @@ void Server::deleteParticleSpawner(const std::string &playername, u32 id)
 	SendDeleteParticleSpawner(peer_id, id);
 }
 
-void Server::deleteParticleSpawnerAll(u32 id)
-{
-	m_env->deleteParticleSpawner(id);
-	SendDeleteParticleSpawner(PEER_ID_INEXISTENT, id);
-}
-
 Inventory* Server::createDetachedInventory(const std::string &name)
 {
 	if(m_detached_inventories.count(name) > 0){
diff --git a/src/server.h b/src/server.h
index 331a91a52..555aab692 100644
--- a/src/server.h
+++ b/src/server.h
@@ -64,31 +64,6 @@ enum ClientDeletionReason {
 	CDR_DENY
 };
 
-class MapEditEventIgnorer
-{
-public:
-	MapEditEventIgnorer(bool *flag):
-		m_flag(flag)
-	{
-		if(*m_flag == false)
-			*m_flag = true;
-		else
-			m_flag = NULL;
-	}
-
-	~MapEditEventIgnorer()
-	{
-		if(m_flag)
-		{
-			assert(*m_flag);
-			*m_flag = false;
-		}
-	}
-
-private:
-	bool *m_flag;
-};
-
 class MapEditEventAreaIgnorer
 {
 public:
@@ -287,7 +262,6 @@ public:
 		const std::string &playername);
 
 	void deleteParticleSpawner(const std::string &playername, u32 id);
-	void deleteParticleSpawnerAll(u32 id);
 
 	// Creates or resets inventory
 	Inventory* createDetachedInventory(const std::string &name);
@@ -527,9 +501,7 @@ private:
 	// Some timers
 	float m_liquid_transform_timer;
 	float m_liquid_transform_every;
-	float m_print_info_timer;
 	float m_masterserver_timer;
-	float m_objectdata_timer;
 	float m_emergethread_trigger_timer;
 	float m_savemap_timer;
 	IntervalLimiter m_map_timer_and_unload_interval;