Fix tickadvance not resetting to tr0 on the server side (#19)

Author: ScribbleTAS

gradle.properties

@@ -9,5 +9,5 @@ discombobulator_version=1.3-SNAPSHOT
 
 # mod
 mod_name=LoTAS-Light
-mod_version=1.1.0
+mod_version=1.1.1
 maven_group=com.mincecrafttas

src/main/java/com/minecrafttas/lotas_light/mixin/MixinTickRateManager.java

@@ -29,7 +29,10 @@
 public abstract class MixinTickRateManager implements Tickratechanger {
 	@Unique
 	private static float tickrateSaved = 20;
-	private boolean advanceTickrate;
+	@Unique
+	private boolean advanceTickrateServer;
+	@Unique
+	private boolean advanceTickrateClient;
 	@Unique
 	private boolean isDisconnecting;
 
@@ -79,7 +82,8 @@ public float getTickrateSaved() {
 
 	@Override
 	public void toggleTickrate0() {
-		advanceTickrate = false;
+		advanceTickrateServer = false;
+		advanceTickrateClient = false;
 		if (tickrate == 0) {
 			setTickRate(tickrateSaved);
 		} else {
@@ -89,28 +93,31 @@ public void toggleTickrate0() {
 
 	@Override
 	public void enableTickrate0(boolean enable) {
-		advanceTickrate = false;
+		advanceTickrateServer = false;
+		advanceTickrateClient = false;
 		if (enable) {
 			if (tickrate != 0)
 				setTickRate(0f);
 		} else {
 			if (tickrate == 0)
 				setTickRate(tickrateSaved);
 		}
-
 	}
 
 	@Override
 	public void advanceTick() {
 		if (tickrate == 0) {
 			setTickRate(tickrateSaved);
-			this.advanceTickrate = true;
+			if (isServer())
+				this.advanceTickrateServer = true;
+			else
+				this.advanceTickrateClient = true;
 		}
 	}
 
 	@Override
 	public boolean isAdvanceTick() {
-		return advanceTickrate;
+		return advanceTickrateServer || advanceTickrateClient;
 	}
 
 	@Override
@@ -124,8 +131,11 @@ public void disconnect() {
 
 	@Inject(method = "tick", at = @At("RETURN"))
 	public void inject_Tick(CallbackInfo ci) {
-		if (advanceTickrate && !(((TickRateManager) (Object) this) instanceof ServerTickRateManager)) {
-			this.advanceTickrate = false;
+		if (advanceTickrateServer || advanceTickrateClient) {
+			if (isServer())
+				this.advanceTickrateServer = false;
+			else
+				this.advanceTickrateClient = false;
 			setTickRate(0);
 		}
 	}
@@ -151,6 +161,10 @@ public long getAdjustedMilliseconds() {
 		return (long) (fakeTimeSinceTC + time);
 	}
 
+	private boolean isServer() {
+		return ((TickRateManager) (Object) this) instanceof ServerTickRateManager;
+	}
+
 	@Shadow
 	protected abstract void setTickRate(float f);