Added a state to savestatehandler

Author: Scribble

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

@@ -13,6 +13,7 @@
 import de.scribble.lp.tasmod.CommonProxy;
 import de.scribble.lp.tasmod.TASmod;
 import de.scribble.lp.tasmod.savestates.server.SavestateHandler;
+import de.scribble.lp.tasmod.savestates.server.SavestateState;
 import de.scribble.lp.tasmod.tickratechanger.TickrateChangerServer;
 import de.scribble.lp.tasmod.ticksync.TickSyncPackage;
 import de.scribble.lp.tasmod.ticksync.TickSyncServer;
@@ -33,8 +34,8 @@ public long modifyMSPT(long fiftyLong) {
 	@Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;tick()V", ordinal = 1))
 	public void redirectTick(MinecraftServer server) {
 		this.tick();
-		if (SavestateHandler.wasLoading) {
-			SavestateHandler.wasLoading = false;
+		if (SavestateHandler.state==SavestateState.WASLOADING) {
+			SavestateHandler.state = SavestateState.NONE;
 			SavestateHandler.playerLoadSavestateEventServer();
 		}
 

src/main/java/de/scribble/lp/tasmod/savestates/server/LoadstatePacketHandler.java

@@ -30,7 +30,7 @@ public IMessage onMessage(LoadstatePacket message, MessageContext ctx) {
 					player.sendMessage(new TextComponentString(TextFormatting.RED+"Failed to load a savestate: "+e.getCause().toString()));
 					e.printStackTrace();
 				} finally {
-					SavestateHandler.isLoading=false;
+					SavestateHandler.state=SavestateState.NONE;
 				}
 			});
 		}else {

src/main/java/de/scribble/lp/tasmod/savestates/server/SavestateHandler.java

@@ -39,10 +39,7 @@ public class SavestateHandler {
 	private static MinecraftServer server=TASmod.getServerInstance();
 	private static File savestateDirectory;
 
-	public static boolean isSaving=false;
-	
-	public static boolean isLoading=false;
-	public static boolean wasLoading=false;
+	public static SavestateState state=SavestateState.NONE;
 
 	/**
 	 * Creates a copy of the currently played world and saves it in .minecraft/saves/savestates/worldname <br>
@@ -53,14 +50,14 @@ public class SavestateHandler {
 	 * @throws IOException
 	 */
 	public static void saveState() throws SavestateException, IOException {
-		if(isSaving) {
+		if(state==SavestateState.SAVING) {
 			throw new SavestateException("A savestating operation is already being carried out");
 		}
-		if(isLoading) {
+		if(state==SavestateState.LOADING) {
 			throw new SavestateException("A loadstate operation is being carried out");
 		}
 		//Lock savestating and loadstating
-		isSaving=true;
+		state=SavestateState.SAVING;
 
 		//Create a directory just in case
 		createSavestateDirectory();
@@ -107,7 +104,7 @@ public static void saveState() throws SavestateException, IOException {
 		CommonProxy.NETWORK.sendToAll(new SavestatePacket());
 
 		//Unlock savestating
-		isSaving=false;
+		state=SavestateState.NONE;
 	}
 
 	/**
@@ -121,10 +118,8 @@ private static File getNextSaveFolderLocation(String worldname) throws Savestate
 		int i = 1;
 		int limit=300;
 		File targetsavefolder=null;
-		isSaving=true;
 		while (i <= limit) {
 			if (i >= limit) {
-				isSaving = false;
 				throw new SavestateException("Savestatecount is greater or equal than "+limit);
 			}
 			targetsavefolder = new File(savestateDirectory,worldname + "-Savestate" + Integer.toString(i)+File.separator);
@@ -171,14 +166,14 @@ private static String nameWhenSaving(String worldname) {
 	 * @throws IOException
 	 */
 	public static void loadState() throws LoadstateException, IOException {
-		if(isSaving) {
+		if(state==SavestateState.SAVING) {
 			throw new LoadstateException("A savestating operation is already being carried out");
 		}
-		if(isLoading) {
+		if(state==SavestateState.LOADING) {
 			throw new LoadstateException("A loadstate operation is being carried out");
 		}
 		//Lock savestating and loadstating
-		isLoading=true;
+		state=SavestateState.LOADING;
 
 		//Create a directory just in case
 		createSavestateDirectory();
@@ -246,8 +241,7 @@ public static void loadState() throws LoadstateException, IOException {
         }
 
 		//Unlock loadstating
-		isLoading=false;
-		wasLoading=true;
+		state=SavestateState.WASLOADING;
 	}
 
 	/**

src/main/java/de/scribble/lp/tasmod/savestates/server/SavestatePacketHandler.java

@@ -38,7 +38,7 @@ public IMessage onMessage(SavestatePacket message, MessageContext ctx) {
 					e.printStackTrace();
 					player.sendMessage(new TextComponentString(TextFormatting.RED+"Failed to create a savestate: "+ e.getCause().toString()));
 				} finally {
-					SavestateHandler.isSaving=false;
+					SavestateHandler.state=SavestateState.NONE;
 				}
 			});
 		}else {

src/main/java/de/scribble/lp/tasmod/savestates/server/SavestateState.java

@@ -0,0 +1,8 @@
+package de.scribble.lp.tasmod.savestates.server;
+
+public enum SavestateState {
+	SAVING,
+	LOADING,
+	WASLOADING,
+	NONE
+}

src/main/java/de/scribble/lp/tasmod/tickratechanger/TickrateChangerServer.java

@@ -1,6 +1,7 @@
 package de.scribble.lp.tasmod.tickratechanger;
 
 import de.scribble.lp.tasmod.CommonProxy;
+import de.scribble.lp.tasmod.TASmod;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 
@@ -13,11 +14,6 @@ public class TickrateChangerServer {
 	public static int cooldownKeyPause;
 	public static int cooldownKeyAdvance;
 
-	private static MinecraftServer serverInstance;
-	
-	public TickrateChangerServer(MinecraftServer server) {
-		serverInstance=server;
-	}
 	public static void changeClientTickrate(float tickrate) {
 		CommonProxy.NETWORK.sendToAll(new TickratePacket(false, tickrate, false));
 	}
@@ -59,8 +55,11 @@ public static void advanceTick() {
      */
 	public static void leaveServer(EntityPlayerMP player) {
 		//TODO Test this in multiplayer
-		if (TickrateChangerServer.TICKS_PER_SECOND == 0) {
-			TickrateChangerServer.changeServerTickrate(20F);
+		if(TASmod.getServerInstance().getPlayerList().getCurrentPlayerCount()==1) {
+			if (TickrateChangerServer.TICKS_PER_SECOND == 0 || ADVANCE_TICK) {
+				TASmod.logger.info("Changing tickrate to 20 since the last player left the server");
+				TickrateChangerServer.changeServerTickrate(20F);
+			}
 		}
 	}
 }