From 79e558be349c40ed40b5eefefd29f563a570e404 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Fri, 4 Jul 2014 17:42:40 +0100
Subject: [PATCH] Suggestions

---
 src/Entities/ThrownEggEntity.cpp        |  2 +-
 src/Entities/ThrownEggEntity.h          |  5 ++++-
 src/Entities/ThrownEnderPearlEntity.cpp |  2 +-
 src/Entities/ThrownEnderPearlEntity.h   |  5 ++++-
 src/Entities/ThrownSnowballEntity.cpp   |  2 +-
 src/Entities/ThrownSnowballEntity.h     |  5 ++++-
 src/Vector3.h                           | 10 +++++-----
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/Entities/ThrownEggEntity.cpp b/src/Entities/ThrownEggEntity.cpp
index d7eed41e3..456083108 100644
--- a/src/Entities/ThrownEggEntity.cpp
+++ b/src/Entities/ThrownEggEntity.cpp
@@ -22,7 +22,7 @@ void cThrownEggEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_H
 {
 	TrySpawnChicken(a_HitPos);
 	
-	m_DestroyTimer = 5;
+	m_DestroyTimer = 2;
 }
 
 
diff --git a/src/Entities/ThrownEggEntity.h b/src/Entities/ThrownEggEntity.h
index 894665428..dc72c279f 100644
--- a/src/Entities/ThrownEggEntity.h
+++ b/src/Entities/ThrownEggEntity.h
@@ -41,7 +41,10 @@ protected:
 				return;
 			}
 		}
-		else { super::Tick(a_Dt, a_Chunk); }
+		else
+		{
+			super::Tick(a_Dt, a_Chunk);
+		}
 	}
 	
 	// Randomly decides whether to spawn a chicken where the egg lands.
diff --git a/src/Entities/ThrownEnderPearlEntity.cpp b/src/Entities/ThrownEnderPearlEntity.cpp
index 96dd41ee6..aeb727205 100644
--- a/src/Entities/ThrownEnderPearlEntity.cpp
+++ b/src/Entities/ThrownEnderPearlEntity.cpp
@@ -22,7 +22,7 @@ void cThrownEnderPearlEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockF
 	// TODO: Tweak a_HitPos based on block face.
 	TeleportCreator(a_HitPos);
 	
-	m_DestroyTimer = 5;
+	m_DestroyTimer = 2;
 }
 
 
diff --git a/src/Entities/ThrownEnderPearlEntity.h b/src/Entities/ThrownEnderPearlEntity.h
index bfd9bd70d..1cea5f7d9 100644
--- a/src/Entities/ThrownEnderPearlEntity.h
+++ b/src/Entities/ThrownEnderPearlEntity.h
@@ -41,7 +41,10 @@ protected:
 				return;
 			}
 		}
-		else { super::Tick(a_Dt, a_Chunk); }
+		else
+		{
+			super::Tick(a_Dt, a_Chunk);
+		}
 	}
 	
 	/** Teleports the creator where the ender pearl lands */
diff --git a/src/Entities/ThrownSnowballEntity.cpp b/src/Entities/ThrownSnowballEntity.cpp
index b82cd56db..d94e75898 100644
--- a/src/Entities/ThrownSnowballEntity.cpp
+++ b/src/Entities/ThrownSnowballEntity.cpp
@@ -20,7 +20,7 @@ cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, do
 
 void cThrownSnowballEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
 {
-	m_DestroyTimer = 5;
+	m_DestroyTimer = 2;
 }
 
 
diff --git a/src/Entities/ThrownSnowballEntity.h b/src/Entities/ThrownSnowballEntity.h
index e30971f0a..9a8770379 100644
--- a/src/Entities/ThrownSnowballEntity.h
+++ b/src/Entities/ThrownSnowballEntity.h
@@ -41,7 +41,10 @@ protected:
 				return;
 			}
 		}
-		else { super::Tick(a_Dt, a_Chunk); }
+		else
+		{
+			super::Tick(a_Dt, a_Chunk);
+		}
 	}
 
 private:
diff --git a/src/Vector3.h b/src/Vector3.h
index faf7fe43c..f350ede2a 100644
--- a/src/Vector3.h
+++ b/src/Vector3.h
@@ -135,12 +135,12 @@ public:
 	}
 
 	/** Runs each value of the vector through std::floor() */
-	inline Vector3<T> Floor(void) const
+	inline Vector3<int> Floor(void) const
 	{
-		return Vector3<T>(
-			(T)floor(x),
-			(T)floor(y),
-			(T)floor(z)
+		return Vector3i(
+			(int)floor(x),
+			(int)floor(y),
+			(int)floor(z)
 		);
 	}