Skip to content

Commit d833ed9

Browse files
committed
[Tickrate] Remove processing the server task queue in Tickrate 0
1 parent 1e3e3e2 commit d833ed9

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/main/java/com/minecrafttas/tasmod/mixin/MixinMinecraftServer.java

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.minecrafttas.mctcommon.events.EventListenerRegistry;
1414
import com.minecrafttas.tasmod.TASmod;
1515
import com.minecrafttas.tasmod.events.EventServer.EventServerTickPost;
16-
import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateState;
1716

1817
import net.fabricmc.api.EnvType;
1918
import net.fabricmc.api.Environment;
@@ -110,18 +109,18 @@ public void redirectThreadSleep(long msToTick) {
110109

111110
TASmod.gameLoopSchedulerServer.runAllTasks();
112111

113-
boolean stopTaskQueue = TASmod.savestateHandlerServer != null && TASmod.savestateHandlerServer.getState() == SavestateState.LOADING;
114-
if (!stopTaskQueue) {
115-
synchronized (this.futureTaskQueue) {
116-
while (!this.futureTaskQueue.isEmpty()) {
117-
try {
118-
((FutureTask<?>) this.futureTaskQueue.poll()).run();
119-
} catch (Throwable var9) {
120-
var9.printStackTrace();
121-
}
122-
}
123-
}
124-
}
112+
// boolean stopTaskQueue = TASmod.savestateHandlerServer != null && TASmod.savestateHandlerServer.getState() == SavestateState.LOADING;
113+
// if (!stopTaskQueue) {
114+
// synchronized (this.futureTaskQueue) {
115+
// while (!this.futureTaskQueue.isEmpty()) {
116+
// try {
117+
// ((FutureTask<?>) this.futureTaskQueue.poll()).run();
118+
// } catch (Throwable var9) {
119+
// var9.printStackTrace();
120+
// }
121+
// }
122+
// }
123+
// }
125124
}
126125

127126
@Environment(EnvType.SERVER)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*
3030
* @author Scribble
3131
*/
32-
public class SavestateTempHandler implements EventControllerStateChange, EventRecordClear, EventSavestate.EventServerLoadstate {
32+
public class SavestateTempHandler implements EventControllerStateChange, EventRecordClear, EventSavestate.EventServerLoadstatePre {
3333

3434
private final Logger logger;
3535
private final SavestateHandlerServer handler;
@@ -149,7 +149,7 @@ public void setNoSave(boolean noSave) {
149149
}
150150

151151
@Override
152-
public void onServerLoadstate(MinecraftServer server, SavestatePaths paths) {
152+
public void onServerLoadstatePre(MinecraftServer server, SavestatePaths paths) {
153153
createState = false;
154154
}
155155
}

src/main/java/com/minecrafttas/tasmod/savestates/storage/builtin/KTRNGSeedStorage.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ public JsonObject onSavestate(MinecraftServer server, JsonObject dataToSave) {
6464

6565
@Override
6666
public void onLoadstateComplete(MinecraftServer server, JsonObject loadedData) {
67+
TASmod.LOGGER.debug("Loading KTRNG seeds");
6768
long newSeed = loadedData.get("globalSeed").getAsLong();
6869
TASmod.globalRandomness.setSeed(newSeed);
6970

0 commit comments

Comments
 (0)