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

Fixed #6815

Browse Source
This commit is contained in:
Anuken
2022-05-11 00:44:15 -04:00
parent 24a6ef2bc3
commit 9b33ab3c0a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
if(pay instanceof BuildPayload pb && pb.build.power != null){ if(pay instanceof BuildPayload pb && pb.build.power != null){
if(payloadPower == null) payloadPower = new PowerGraph(); if(payloadPower == null) payloadPower = new PowerGraph();
pb.build.team = team; //pb.build.team = team;
pb.build.power.graph = null; pb.build.power.graph = null;
payloadPower.add(pb.build); payloadPower.add(pb.build);
} }
@@ -51,9 +51,10 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
} }
for(Payload pay : payloads){ for(Payload pay : payloads){
if(pay instanceof BuildPayload build){ //apparently BasedUser doesn't want this and several plugins use it
build.build.team = team; //if(pay instanceof BuildPayload build){
} // build.build.team = team;
//}
pay.set(x, y, rotation); pay.set(x, y, rotation);
pay.update(true); pay.update(true);
} }

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

@@ -83,7 +83,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
moveAt(Tmp.v2.trns(rotation, vec.len())); moveAt(Tmp.v2.trns(rotation, vec.len()));
if(!vec.isZero()){ if(!vec.isZero()){
rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Math.max(Time.delta, 1)); rotation = Angles.moveToward(rotation, vec.angle(), type.rotateSpeed * Time.delta);
} }
} }