Skip to content

Commit 014b63d

Browse files
committed
fix: always perform conversion checks
1 parent 22ca133 commit 014b63d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/mekanism/common/integration/energy/forgeenergy/ForgeEnergyIntegration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public int receiveEnergy(int maxReceive, boolean simulate) {
3232
if (toInsert == 0) {
3333
return 0;
3434
}
35-
if (action.execute() && !converter.isOneToOne()) {
35+
if (!converter.isOneToOne()) {
3636
//Before we can actually execute it we need to simulate to calculate how much we can actually insert
3737
long simulatedRemainder = handler.insertEnergy(toInsert, Action.SIMULATE);
3838
if (simulatedRemainder == toInsert) {
@@ -69,7 +69,7 @@ public int extractEnergy(int maxExtract, boolean simulate) {
6969
if (toExtract == 0) {
7070
return 0;
7171
}
72-
if (action.execute() && !converter.isOneToOne()) {
72+
if (!converter.isOneToOne()) {
7373
//Before we can actually execute it we need to simulate to calculate how much we can actually extract in our other units
7474
long simulatedExtracted = handler.extractEnergy(toExtract, Action.SIMULATE);
7575
//Convert how much we could extract back to FE so that it gets appropriately clamped so that for example 1.5 FE gets treated

0 commit comments

Comments
 (0)