From 7098d613a0e18e6bc7eaa57dda92a0c536f38abb Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 28 Jun 2012 08:21:24 -0400
Subject: [PATCH] Tweak profiler command on bukkit

---
 .../cpw/mods/fml/server/FMLBukkitProfiler.java     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/fml/bukkit/cpw/mods/fml/server/FMLBukkitProfiler.java b/fml/bukkit/cpw/mods/fml/server/FMLBukkitProfiler.java
index 75ca691c33..c25a323b9b 100644
--- a/fml/bukkit/cpw/mods/fml/server/FMLBukkitProfiler.java
+++ b/fml/bukkit/cpw/mods/fml/server/FMLBukkitProfiler.java
@@ -25,13 +25,21 @@ public class FMLBukkitProfiler {
 
 	public static long beginProfiling(int seconds)
 	{
+		long now = System.currentTimeMillis();
 		if (lastInstance == null)
 		{
 			lastInstance = new FMLBukkitProfiler();
 			FMLBukkitHandler.instance().profiler = lastInstance;
-			endTime = System.currentTimeMillis() + seconds;
+			endTime = now + seconds;
+		}
+		if (endTime > now)
+		{
+			return endTime - now;
+		}
+		else
+		{
+			return 0;
 		}
-		return endTime - System.currentTimeMillis();
 	}
 
 	public static long endProfiling()
@@ -69,7 +77,7 @@ public class FMLBukkitProfiler {
 	{
 		if (lastInstance == null)
 		{
-			return new String[0];
+			return new String[] { "No profile data available" };
 		}
 
 		if (endTime > System.currentTimeMillis())