mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-03-17 12:21:19 -07:00
Code Issues 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
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);
on.build.handlePayload(on.build, payload);
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
public float totalProgress(){
return enabled ? super.totalProgress() : 0f;
return enabled && sum > 0 ? super.totalProgress() : 0f;
}
@Override