Fix attached particle spawners far from spawn (#6479)

raymoo · nerzhul · commit 8c16f18fdbe9 · 2017-09-30T15:23:51.000+02:00
* Fix attached particle spawners far from spawn

When far from spawn, attached particle spawners
did not spawn particles.
diff --git a/src/particles.cpp b/src/particles.cpp
@@ -317,14 +317,18 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 					v3f ppos = m_player->getPosition() / BS;
 					v3f pos = random_v3f(m_minpos, m_maxpos);
 
+					// Need to apply this first or the following check
+					// will be wrong for attached spawners
+					if (is_attached)
+						pos += attached_pos;
+
 					if (pos.getDistanceFrom(ppos) <= radius) {
 						v3f vel = random_v3f(m_minvel, m_maxvel);
 						v3f acc = random_v3f(m_minacc, m_maxacc);
 
 						if (is_attached) {
 							// Apply attachment yaw and position
 							pos.rotateXZBy(attached_yaw);
-							pos += attached_pos;
 							vel.rotateXZBy(attached_yaw);
 							acc.rotateXZBy(attached_yaw);
 						}
@@ -377,14 +381,18 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
 				v3f ppos = m_player->getPosition() / BS;
 				v3f pos = random_v3f(m_minpos, m_maxpos);
 
+				// Need to apply this first or the following check
+				// will be wrong for attached spawners
+				if (is_attached)
+					pos += attached_pos;
+
 				if (pos.getDistanceFrom(ppos) <= radius) {
 					v3f vel = random_v3f(m_minvel, m_maxvel);
 					v3f acc = random_v3f(m_minacc, m_maxacc);
 
 					if (is_attached) {
 						// Apply attachment yaw and position
 						pos.rotateXZBy(attached_yaw);
-						pos += attached_pos;
 						vel.rotateXZBy(attached_yaw);
 						acc.rotateXZBy(attached_yaw);
 					}
