Working on #137

Author: Scribble

src/main/java/de/scribble/lp/tasmod/events/LoadWorldEvents.java

@@ -8,6 +8,7 @@
 public class LoadWorldEvents {
 
 	public static boolean waszero = false;
+	private static boolean isLoading =false;
 
 	/**
 	 * Delay after the loading screen is finished before firing "doneWithLoadingScreen"
@@ -24,6 +25,7 @@ public static void startLaunchServer() {
 		if (TickrateChangerClient.ticksPerSecond == 0 || TickrateChangerClient.advanceTick) {
 			waszero = true;
 		}
+		isLoading = true;
 	}
 
 	/**
@@ -85,9 +87,13 @@ public static void doneWithLoadingScreen() {
 				} else {
 					waszero = false;
 				}
+				isLoading=false;
 			}
 			loadingScreenDelay--;
 		}
 	}
 
+	public static boolean isLoading() {
+		return isLoading;
+	}
 }

src/main/java/de/scribble/lp/tasmod/mixin/MixinMinecraftServer.java

@@ -96,28 +96,28 @@ public void redirectThreadSleep(long msToTick) {
 			if (TickrateChangerServer.ticksPerSecond == 0) {
 				currentTime = System.currentTimeMillis();
 				faketick++;
-				if (faketick >= 20) {
+				if (faketick >= 50) {
 					faketick = 0;
 					networkSystem.networkTick();
 					if (((MinecraftServer) (Object) this).isDedicatedServer()) {
 						runPendingCommands();
 					}
+					synchronized (this.futureTaskQueue) {
+						while (!this.futureTaskQueue.isEmpty()) {
+							try {
+								((FutureTask<?>) this.futureTaskQueue.poll()).run();
+							} catch (Throwable var9) {
+								var9.printStackTrace();
+							}
+						}
+					}
 				}
 			}
 			if (TickrateChangerServer.interrupt) {
 				currentTime = System.currentTimeMillis();
 				msToTick = 1L;
 				TickrateChangerServer.interrupt = false;
 			}
-			synchronized (this.futureTaskQueue) {
-				while (!this.futureTaskQueue.isEmpty()) {
-					try {
-						((FutureTask<?>) this.futureTaskQueue.poll()).run();
-					} catch (Throwable var9) {
-						var9.printStackTrace();
-					}
-				}
-			}
 
 			try {
 				Thread.sleep(1L);

src/main/java/de/scribble/lp/tasmod/mixin/fixes/MixinNetworkManager.java

@@ -0,0 +1,35 @@
+package de.scribble.lp.tasmod.mixin.fixes;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import de.scribble.lp.tasmod.events.LoadWorldEvents;
+import de.scribble.lp.tasmod.tickratechanger.TickrateChangerServer;
+import net.minecraft.network.INetHandler;
+import net.minecraft.network.NetHandlerPlayServer;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.util.ITickable;
+
+@Mixin(NetworkManager.class)
+public class MixinNetworkManager {
+	@Shadow
+	private INetHandler packetListener;
+
+	/**
+	 * Fixes #137
+	 * 
+	 * @param manager
+	 */
+	@Redirect(method = "processReceivedPackets", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/ITickable;update()V"))
+	public void redirect_processReceivedPackets(ITickable manager) {
+		if (TickrateChangerServer.ticksPerSecond == 0) {
+			if (!(packetListener instanceof NetHandlerPlayServer) || LoadWorldEvents.isLoading()) {
+				manager.update();
+			}
+		} else {
+			manager.update();
+		}
+	}
+}

src/main/resources/mixins.tasmod.json

@@ -20,6 +20,7 @@
 
         //Fixing forge and vanilla stuff
         "fixes.MixinDragonFightManager",
+        "fixes.MixinNetworkManager",
 
         //Accessors
         "accessors.AccessorEntity",