diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
index 214c0dfd5..e8a90db92 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/EmptyAdvancementDataPlayer.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.util.Set;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.server.v1_12_R1.Advancement;
 import net.minecraft.server.v1_12_R1.AdvancementDataPlayer;
@@ -13,7 +14,7 @@ import net.minecraft.server.v1_12_R1.MinecraftServer;
 
 public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
     public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
-        super(minecraftserver, file, entityplayer);
+        super(minecraftserver, CitizensAPI.getDataFolder(), entityplayer);
         this.b();
     }
 
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
index ba6a49a81..f59fe8ffc 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/EmptyAdvancementDataPlayer.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.lang.reflect.Field;
 import java.util.Set;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.server.v1_13_R2.Advancement;
 import net.minecraft.server.v1_13_R2.AdvancementDataPlayer;
@@ -13,7 +14,7 @@ import net.minecraft.server.v1_13_R2.MinecraftServer;
 
 public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
     public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
-        super(minecraftserver, file, entityplayer);
+        super(minecraftserver, CitizensAPI.getDataFolder(), entityplayer);
         this.b();
     }
 
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java
index f2e43a55a..86a5f9e13 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/EmptyAdvancementDataPlayer.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.lang.invoke.MethodHandle;
 import java.util.Set;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.server.v1_14_R1.Advancement;
 import net.minecraft.server.v1_14_R1.AdvancementDataPlayer;
@@ -13,7 +14,7 @@ import net.minecraft.server.v1_14_R1.MinecraftServer;
 
 public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
     public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
-        super(minecraftserver, file, entityplayer);
+        super(minecraftserver, CitizensAPI.getDataFolder(), entityplayer);
         this.b();
     }
 
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java
index 71677c1d2..bea1cf80e 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/EmptyAdvancementDataPlayer.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.lang.invoke.MethodHandle;
 import java.util.Set;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.server.v1_15_R1.Advancement;
 import net.minecraft.server.v1_15_R1.AdvancementDataPlayer;
@@ -13,7 +14,7 @@ import net.minecraft.server.v1_15_R1.MinecraftServer;
 
 public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
     public EmptyAdvancementDataPlayer(MinecraftServer minecraftserver, File file, EntityPlayer entityplayer) {
-        super(minecraftserver, file, entityplayer);
+        super(minecraftserver, CitizensAPI.getDataFolder(), entityplayer);
         this.b();
     }
 
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java
index 4b8176f37..0af5556fd 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/EmptyAdvancementDataPlayer.java
@@ -6,6 +6,7 @@ import java.util.Set;
 
 import com.mojang.datafixers.DataFixer;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.server.v1_16_R3.Advancement;
 import net.minecraft.server.v1_16_R3.AdvancementDataPlayer;
@@ -17,7 +18,7 @@ import net.minecraft.server.v1_16_R3.PlayerList;
 public class EmptyAdvancementDataPlayer extends AdvancementDataPlayer {
     public EmptyAdvancementDataPlayer(DataFixer datafixer, PlayerList playerlist,
             AdvancementDataWorld advancementdataworld, File file, EntityPlayer entityplayer) {
-        super(datafixer, playerlist, advancementdataworld, file, entityplayer);
+        super(datafixer, playerlist, advancementdataworld, CitizensAPI.getDataFolder(), entityplayer);
         this.b();
     }
 
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java
index e911fb246..263e62fe4 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/EmptyAdvancementDataPlayer.java
@@ -6,6 +6,7 @@ import java.util.Set;
 
 import com.mojang.datafixers.DataFixer;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementProgress;
@@ -17,7 +18,7 @@ import net.minecraft.server.players.PlayerList;
 public class EmptyAdvancementDataPlayer extends PlayerAdvancements {
     public EmptyAdvancementDataPlayer(DataFixer datafixer, PlayerList playerlist,
             ServerAdvancementManager advancementdataworld, File file, ServerPlayer entityplayer) {
-        super(datafixer, playerlist, advancementdataworld, file, entityplayer);
+        super(datafixer, playerlist, advancementdataworld, CitizensAPI.getDataFolder(), entityplayer);
         this.save();
     }
 
diff --git a/v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/util/EmptyAdvancementDataPlayer.java b/v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/util/EmptyAdvancementDataPlayer.java
index 609ba0102..71e1f6396 100644
--- a/v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/util/EmptyAdvancementDataPlayer.java
+++ b/v1_18_R1/src/main/java/net/citizensnpcs/nms/v1_18_R1/util/EmptyAdvancementDataPlayer.java
@@ -6,6 +6,7 @@ import java.util.Set;
 
 import com.mojang.datafixers.DataFixer;
 
+import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.util.NMS;
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementProgress;
@@ -17,7 +18,7 @@ import net.minecraft.server.players.PlayerList;
 public class EmptyAdvancementDataPlayer extends PlayerAdvancements {
     public EmptyAdvancementDataPlayer(DataFixer datafixer, PlayerList playerlist,
             ServerAdvancementManager advancementdataworld, File file, ServerPlayer entityplayer) {
-        super(datafixer, playerlist, advancementdataworld, file, entityplayer);
+        super(datafixer, playerlist, advancementdataworld, CitizensAPI.getDataFolder(), entityplayer);
         this.save();
     }