Skip to content

Fix return value of SingleInk storage, so it stops duping initial fill #906

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

Merged
imreallybadatnames merged 1 commit into from
Jun 14, 2026
+10 −12
Merged

Fix return value of SingleInk storage, so it stops duping initial fill #906

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
22 changes: 10 additions & 12 deletions src/main/java/de/dafuqs/spectrum/api/energy/storage/SingleInkStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,18 @@ public boolean accepts(InkColor color) {

@Override
public long addEnergy(InkColor color, long amount) {
if (color == storedColor) {
long resultingAmount = this.storedEnergy + amount;
this.storedEnergy = resultingAmount;
if (resultingAmount > this.maxEnergy) {
long overflow = this.storedEnergy - this.maxEnergy;
this.storedEnergy = this.maxEnergy;
return overflow;
}
return 0;
} else if (this.storedEnergy == 0) {
if (color != storedColor && this.storedEnergy != 0)
return amount;
if (this.storedEnergy == 0)
this.storedColor = color;
this.storedEnergy = amount;
long resultingAmount = this.storedEnergy + amount;
this.storedEnergy = resultingAmount;
if (resultingAmount > this.maxEnergy) {
long overflow = this.storedEnergy - this.maxEnergy;
this.storedEnergy = this.maxEnergy;
return overflow;
}
return amount;
return 0;
}

@Override
Expand Down
Loading