upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 11:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #164 from KAMKEEL/codex/fix-race-condition-in-profile-system

Browse Source 
Fixes Profile Race Condition Issues
This commit is contained in:
Kam authored and GitHub committed 2025-06-30 21:57:52 -04:00
2 parents 67926477be 6829547d3a
commit 9f556ea045
1 file changed
+12 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/kamkeel/npcs/controllers/ProfileController.java
+12 -6
View File
@@ -110,8 +110,12 @@ public class ProfileController implements IProfileHandler {
profile.currentSlotId = 0;
saveSlotData(player);
}
if (!profile.getSlots().containsKey(profile.currentSlotId)) {
profile.currentSlotId = 0;
}
profile.player = player;
activeProfiles.put(player.getUniqueID(), profile);
loadSlotData(player);
verifySlotQuests(profile.player);
save(player, profile);
}
@@ -147,9 +151,9 @@ public class ProfileController implements IProfileHandler {
public synchronized void saveOffline(Profile profile, UUID uuid) {
profile.setLocked(true);
final NBTTagCompound compound = profile.writeToNBT();
final String filename = uuid.toString() + ".dat";
CustomNPCsThreader.customNPCThread.execute(() -> {
final NBTTagCompound compound = profile.writeToNBT();
final String filename = uuid.toString() + ".dat";
try {
File saveDir = getProfileDir();
File fileNew = new File(saveDir, filename + "_new");
@@ -170,9 +174,9 @@ public class ProfileController implements IProfileHandler {
public synchronized void save(EntityPlayer player, Profile profile) {
profile.setLocked(true);
final NBTTagCompound compound = profile.writeToNBT();
final String filename = player.getUniqueID() + ".dat";
CustomNPCsThreader.customNPCThread.execute(() -> {
final NBTTagCompound compound = profile.writeToNBT();
final String filename = player.getUniqueID() + ".dat";
try {
File saveDir = getProfileDir();
File fileNew = new File(saveDir, filename + "_new");
@@ -623,7 +627,7 @@ public class ProfileController implements IProfileHandler {
for (IProfileData profileData : profileTypes.values()) {
NBTTagCompound data;
if (slot.getComponents().containsKey(profileData.getTagName()))
data = slot.getComponentData(profileData.getTagName());
data = (NBTTagCompound) slot.getComponentData(profileData.getTagName()).copy();
else
data = new NBTTagCompound();
profileData.setNBT(player, data);
@@ -656,7 +660,7 @@ public class ProfileController implements IProfileHandler {
ISlot slot = profile.getSlots().get(slotId);
for (IProfileData pd : dataList) {
if (slot.getComponents().containsKey(pd.getTagName())) {
NBTTagCompound sub = slot.getComponentData(pd.getTagName());
NBTTagCompound sub = (NBTTagCompound) slot.getComponentData(pd.getTagName()).copy();
List<ProfileInfoEntry> subInfo = pd.getInfo(player, sub);
infoList.addAll(subInfo);
}
@@ -770,6 +774,8 @@ public class ProfileController implements IProfileHandler {
NBTTagCompound compound = slot.getComponentData(new CNPCData().getTagName());
if (compound == null)
compound = new NBTTagCompound();
else
compound = (NBTTagCompound) compound.copy();
playerData.setNBT(compound);
return playerData;
}