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

Fixed #3431 / Fixed #3432 / Fixed #3429 / Fixed #3435 / Fixed #3434

Browse Source
This commit is contained in:
Anuken
2020-11-17 10:18:08 -05:00
parent 3c36749990
commit b46676014b
8 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/entities/comp/BuildingComp.java
View File

@@ -519,7 +519,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
public void dumpLiquid(Liquid liquid){
int dump = this.cdump;
if(!net.client()) liquid.unlock();
if(!net.client() && state.isCampaign()) liquid.unlock();
for(int i = 0; i < proximity.size; i++){
incrementDump(proximity.size);
@@ -620,7 +620,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
*/
public void offload(Item item){
int dump = this.cdump;
if(!net.client()) item.unlock();
if(!net.client() && state.isCampaign()) item.unlock();
for(int i = 0; i < proximity.size; i++){
incrementDump(proximity.size);

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

@@ -24,8 +24,8 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
/** weapon mount array, never null */
@SyncLocal WeaponMount[] mounts = {};
@ReadOnly transient float aimX, aimY;
@ReadOnly transient boolean isRotate;
transient float aimX, aimY;
boolean isShooting;
float ammo;

4
core/src/mindustry/entities/units/AIController.java
View File

@@ -142,6 +142,10 @@ public class AIController implements UnitController{
mount.rotate = shoot;
unit.isShooting |= shoot;
if(shoot){
unit.aimX = mount.aimX;
unit.aimY = mount.aimY;
}
}
}