From dceffe23c39ea42e16d52848447f5d6eb9c6072e Mon Sep 17 00:00:00 2001
From: mezz <tehgeek@gmail.com>
Date: Wed, 4 Feb 2015 01:18:37 -0800
Subject: [PATCH] #19 end butterfly lifecycle after a Minecraft week

---
 .../lepidopterology/entities/EntityButterfly.java         | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java
index 1295678dd..d2c366394 100755
--- a/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java
+++ b/src/main/java/forestry/lepidopterology/entities/EntityButterfly.java
@@ -108,6 +108,8 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
 	public int cooldownPollination = 0;
 	public int cooldownEgg = 0;
 
+	public int lifespanRemaining = 24000 * 7; // one minecraft week in ticks
+
 	/* CONSTRUCTOR */
 	public EntityButterfly(World world) {
 		super(world);
@@ -455,6 +457,12 @@ public class EntityButterfly extends EntityCreature implements IEntityButterfly
 			attackEntityFrom(DamageSource.generic, 1);
 		}
 
+		if (lifespanRemaining > 0) {
+			lifespanRemaining--;
+		} else {
+			attackEntityFrom(DamageSource.generic, 1);
+		}
+
 		// Reduce cooldowns
 		if (cooldownEgg > 0) {
 			cooldownEgg--;