Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Payload bugfixes

Browse Source
This commit is contained in:
Anuken
2024-10-14 21:29:56 -04:00
parent 92b2a5a764
commit 82de8ca468
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/PayloadComp.java
View File

@@ -131,7 +131,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
} }
//drop off payload on an acceptor if possible //drop off payload on an acceptor if possible
if(on != null && on.build != null && on.build.acceptPayload(on.build, payload)){ if(on != null && on.build != null && on.build.team == team && on.build.acceptPayload(on.build, payload)){
Fx.unitDrop.at(on.build); Fx.unitDrop.at(on.build);
on.build.handlePayload(on.build, payload); on.build.handlePayload(on.build, payload);
return true; return true;

8
core/src/mindustry/world/blocks/power/ThermalGenerator.java
View File

@@ -88,9 +88,15 @@ public class ThermalGenerator extends PowerGenerator{
} }
} }
@Override
public void afterPickedUp(){
super.afterPickedUp();
sum = 0f;
}
@Override @Override
public float totalProgress(){ public float totalProgress(){
return enabled ? super.totalProgress() : 0f; return enabled && sum > 0 ? super.totalProgress() : 0f;
} }
@Override @Override