Skip to content

Commit 094f0a0

Browse files
committed
[Savestates] Fix temporary savestates triggering on fullrecord/fullplay/restart
1 parent 6282b67 commit 094f0a0

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,7 @@ public void onClientInit(Minecraft mc) {
10851085
logger.catching(e);
10861086
}
10871087

1088+
TASmod.savestateHandlerServer.getSavestateTemporaryHandler().setNoSave(true);
10881089
setTASState(TASstate.PLAYBACK);
10891090
}
10901091
}

src/main/java/com/minecrafttas/tasmod/playback/PlaybackControllerServer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ public void fullRecord() {
158158
TASmod.savestateHandlerServer.resetState();
159159
}
160160

161+
TASmod.savestateHandlerServer.getSavestateTemporaryHandler().setNoSave(true);
161162
setTASStateServer(TASstate.RECORDING);
162163

163164
try {
@@ -187,6 +188,7 @@ public void fullPlay() {
187188
TASmod.savestateHandlerServer.resetState();
188189
}
189190

191+
TASmod.savestateHandlerServer.getSavestateTemporaryHandler().setNoSave(true);
190192
setTASStateServer(TASstate.PLAYBACK);
191193

192194
try {

src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateTempHandler.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@
1111
import com.minecrafttas.tasmod.TASmod;
1212
import com.minecrafttas.tasmod.events.EventPlaybackClient.EventRecordClear;
1313
import com.minecrafttas.tasmod.events.EventPlaybackServer.EventControllerStateChange;
14+
import com.minecrafttas.tasmod.events.EventSavestate;
1415
import com.minecrafttas.tasmod.networking.TASmodBufferBuilder;
1516
import com.minecrafttas.tasmod.playback.PlaybackControllerClient.TASstate;
1617
import com.minecrafttas.tasmod.registries.TASmodPackets;
1718
import com.minecrafttas.tasmod.savestates.SavestateHandlerServer;
19+
import com.minecrafttas.tasmod.savestates.SavestateIndexer.SavestatePaths;
1820
import com.minecrafttas.tasmod.savestates.exceptions.SavestateException;
1921
import com.minecrafttas.tasmod.util.Component;
2022

23+
import net.minecraft.server.MinecraftServer;
2124
import net.minecraft.util.text.TextFormatting;
2225

2326
/**
@@ -26,7 +29,7 @@
2629
*
2730
* @author Scribble
2831
*/
29-
public class SavestateTempHandler implements EventControllerStateChange, EventRecordClear {
32+
public class SavestateTempHandler implements EventControllerStateChange, EventRecordClear, EventSavestate.EventServerLoadstate {
3033

3134
private final Logger logger;
3235
private final SavestateHandlerServer handler;
@@ -144,4 +147,9 @@ public void onRecordingClear() {
144147
public void setNoSave(boolean noSave) {
145148
this.noSave = noSave;
146149
}
150+
151+
@Override
152+
public void onServerLoadstate(MinecraftServer server, SavestatePaths paths) {
153+
createState = false;
154+
}
147155
}

0 commit comments

Comments
 (0)