Fix 0 TPS and Infinity time/tick with periodic profiling disabled.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>
MinimallyCorrect · May 30, 2013 · 105b2b2 · 105b2b2
1 parent df27c75
commit 105b2b2
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/src/common/me/nallar/tickprofiler/minecraft/TickProfiler.java b/src/common/me/nallar/tickprofiler/minecraft/TickProfiler.java
@@ -67,14 +67,6 @@ public TickProfiler() {
 	@Mod.Init
 	public void init(FMLInitializationEvent event) {
 		MinecraftForge.EVENT_BUS.register(this);
-		initPeriodicProfiling();
-	}
-
-	private void initPeriodicProfiling() {
-		final int profilingInterval = this.profilingInterval;
-		if (profilingInterval == 0) {
-			return;
-		}
 		TickRegistry.registerScheduledTickHandler(new ProfilingScheduledTickHandler(profilingInterval, MinecraftServer.getServer().getFile(profilingFileName)), Side.SERVER);
 	}
 
@@ -178,7 +170,8 @@ public int nextTickSpacing() {
 		public void tickStart(final EnumSet<TickType> type, final Object... tickData) {
 			final EntityTickProfiler entityTickProfiler = EntityTickProfiler.ENTITY_TICK_PROFILER;
 			entityTickProfiler.tick();
-			if (counter++ % (profilingInterval * 60 * 20) != 0) {
+			int profilingInterval = this.profilingInterval;
+			if (profilingInterval <= 0 || counter++ % (profilingInterval * 60 * 20) != 0) {
 				return;
 			}
 			entityTickProfiler.startProfiling(new Runnable() {