make flag only affect player saving, not loading

ModFest · Aug 28, 2024 · d2f3d61 · d2f3d61
1 parent e8484e6
commit d2f3d61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/net/modfest/fireblanket/FireblanketMixin.java b/src/main/java/net/modfest/fireblanket/FireblanketMixin.java
@@ -117,11 +117,7 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
 			return !ALLOW_FOOTGUNS;
 		}
 
-		if (mixinClassName.contains("footgun")) {
-			return !ALLOW_FOOTGUNS;
-		}
-
-		if (mixinClassName.contains("MixinRegionFile") || mixinClassName.contains("MixinPersistentState") || mixinClassName.contains("MixinLevelStorageSession")) {
+		if (mixinClassName.contains("MixinRegionFile") || mixinClassName.contains("MixinPersistentState")) {
 			return !AVOID_ZTSD;
 		}
 

diff --git a/src/main/java/net/modfest/fireblanket/mixinsupport/ZestyPlayerSaveHandler.java b/src/main/java/net/modfest/fireblanket/mixinsupport/ZestyPlayerSaveHandler.java
@@ -27,6 +27,7 @@
 
 public class ZestyPlayerSaveHandler extends PlayerSaveHandler {
 	private static final Logger LOGGER = LogUtils.getLogger();
+	public static final boolean AVOID_ZTSD = Boolean.getBoolean("fireblanket.saveAsDat");
 
 	private final File playerDataDir;
 
@@ -64,6 +65,10 @@ public Optional<NbtCompound> loadPlayerData(PlayerEntity player) {
 
 	@Override
 	public void savePlayerData(PlayerEntity player) {
+		if (AVOID_ZTSD) {
+			super.savePlayerData(player);
+			return;
+		}
 		try {
 			NbtCompound nbt = player.writeNbt(new NbtCompound());
 			File tmp = File.createTempFile(player.getUuidAsString() + "-", ".zat", playerDataDir);