From: SmallJoker <mk939@ymail.com>
Date: Sun, 13 Aug 2017 07:49:29 +0000 (+0200)
Subject: Damage: Remove damage ignore timer
X-Git-Tag: 0.4.17~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f9738c1909309ff311f604371d7d73abde753e1d;p=oweals%2Fminetest.git

Damage: Remove damage ignore timer
---

diff --git a/src/client.cpp b/src/client.cpp
index a5228132d..abc84b7cf 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -73,7 +73,6 @@ Client::Client(
 	m_connection_reinit_timer(0.1),
 	m_avg_rtt_timer(0.0),
 	m_playerpos_send_timer(0.0),
-	m_ignore_damage_timer(0.0),
 	m_tsrc(tsrc),
 	m_shsrc(shsrc),
 	m_itemdef(itemdef),
@@ -275,14 +274,9 @@ void Client::step(float dtime)
 	DSTACK(FUNCTION_NAME);
 
 	// Limit a bit
-	if(dtime > 2.0)
+	if (dtime > 2.0)
 		dtime = 2.0;
 
-	if(m_ignore_damage_timer > dtime)
-		m_ignore_damage_timer -= dtime;
-	else
-		m_ignore_damage_timer = 0.0;
-
 	m_animation_time += dtime;
 	if(m_animation_time > 60.0)
 		m_animation_time -= 60.0;
@@ -429,18 +423,16 @@ void Client::step(float dtime)
 		ClientEnvEvent envEvent = m_env.getClientEnvEvent();
 
 		if (envEvent.type == CEE_PLAYER_DAMAGE) {
-			if (m_ignore_damage_timer <= 0) {
-				u8 damage = envEvent.player_damage.amount;
+			u8 damage = envEvent.player_damage.amount;
 
-				if (envEvent.player_damage.send_to_server)
-					sendDamage(damage);
+			if (envEvent.player_damage.send_to_server)
+				sendDamage(damage);
 
-				// Add to ClientEvent queue
-				ClientEvent event;
-				event.type = CE_PLAYER_DAMAGE;
-				event.player_damage.amount = damage;
-				m_client_event_queue.push(event);
-			}
+			// Add to ClientEvent queue
+			ClientEvent event;
+			event.type = CE_PLAYER_DAMAGE;
+			event.player_damage.amount = damage;
+			m_client_event_queue.push(event);
 		}
 		// Protocol v29 or greater obsoleted this event
 		else if (envEvent.type == CEE_PLAYER_BREATH && m_proto_ver < 29) {
diff --git a/src/client.h b/src/client.h
index b4145c76f..644549d7f 100644
--- a/src/client.h
+++ b/src/client.h
@@ -574,7 +574,6 @@ private:
 	float m_connection_reinit_timer;
 	float m_avg_rtt_timer;
 	float m_playerpos_send_timer;
-	float m_ignore_damage_timer; // Used after server moves player
 	IntervalLimiter m_map_timer_and_unload_interval;
 
 	IWritableTextureSource *m_tsrc;
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp
index 8935ed90c..0d4b792de 100644
--- a/src/network/clientpackethandler.cpp
+++ b/src/network/clientpackethandler.cpp
@@ -580,10 +580,6 @@ void Client::handleCommand_MovePlayer(NetworkPacket* pkt)
 	event.player_force_move.pitch = pitch;
 	event.player_force_move.yaw = yaw;
 	m_client_event_queue.push(event);
-
-	// Ignore damage for a few seconds, so that the player doesn't
-	// get damage from falling on ground
-	m_ignore_damage_timer = 3.0;
 }
 
 void Client::handleCommand_DeathScreen(NetworkPacket* pkt)