Skip to content

[1.20.1] Concurrent modification spam #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SaloEater wants to merge 1 commit into
base: 1.20.x
Choose a base branch
from
Open

[1.20.1] Concurrent modification spam #589

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/main/java/top/theillusivec4/curios/common/inventory/CurioStacksHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,10 @@ private void addLegacyChange(int shift) {
AttributeModifier newModifier =
new AttributeModifier(LEGACY_UUID, "legacy", current, AttributeModifier.Operation.ADDITION);
this.modifiers.put(newModifier.getId(), newModifier);
Collection<AttributeModifier> modifiers =
this.getModifiersByOperation(newModifier.getOperation());
modifiers.remove(newModifier);
modifiers.add(newModifier);
synchronized (this.modifiersByOperation) {
this.modifiersByOperation.remove(newModifier.getOperation(), newModifier);
this.modifiersByOperation.put(newModifier.getOperation(), newModifier);
}
this.persistentModifiers.remove(newModifier);
this.persistentModifiers.add(newModifier);
this.flagUpdate();
Expand Down Expand Up @@ -437,12 +437,16 @@ public Set<AttributeModifier> getCachedModifiers() {

public Collection<AttributeModifier> getModifiersByOperation(
AttributeModifier.Operation operation) {
return this.modifiersByOperation.get(operation);
synchronized (this.modifiersByOperation) {
return new ArrayList<>(this.modifiersByOperation.get(operation));
}
}

public void addTransientModifier(AttributeModifier modifier) {
this.modifiers.put(modifier.getId(), modifier);
this.getModifiersByOperation(modifier.getOperation()).add(modifier);
synchronized (this.modifiersByOperation) {
this.modifiersByOperation.put(modifier.getOperation(), modifier);
}
this.flagUpdate();
}

Expand All @@ -456,7 +460,9 @@ public void removeModifier(UUID uuid) {

if (modifier != null) {
this.persistentModifiers.remove(modifier);
this.getModifiersByOperation(modifier.getOperation()).remove(modifier);
synchronized (this.modifiersByOperation) {
this.modifiersByOperation.remove(modifier.getOperation(), modifier);
}
this.flagUpdate();
}
}
Expand Down