mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-07 03:01:28 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry

Browse source
This commit is contained in:
Anuken 2022-09-12 19:47:58 -04:00
commit bf8ebb773e
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/src/mindustry/type/UnitType.java
View file

@ -1181,10 +1181,6 @@ public class UnitType extends UnlockableContent{
drawShield(unit); drawShield(unit);
} }
if(mech != null){
unit.trns(-legOffset.x, -legOffset.y);
}
//TODO how/where do I draw under? //TODO how/where do I draw under?
if(parts.size > 0){ if(parts.size > 0){
for(int i = 0; i < parts.size; i++){ for(int i = 0; i < parts.size; i++){
@ -1212,6 +1208,10 @@ public class UnitType extends UnlockableContent{
} }
} }
if(mech != null){
unit.trns(-legOffset.x, -legOffset.y);
}
Draw.reset(); Draw.reset();
} }

2
core/src/mindustry/type/Weapon.java
View file

@ -408,12 +408,12 @@ public class Weapon implements Cloneable{
} }
shoot.shoot(mount.totalShots, (xOffset, yOffset, angle, delay, mover) -> { shoot.shoot(mount.totalShots, (xOffset, yOffset, angle, delay, mover) -> {
mount.totalShots++;
if(delay > 0f){ if(delay > 0f){
Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover)); Time.run(delay, () -> bullet(unit, mount, xOffset, yOffset, angle, mover));
}else{ }else{
bullet(unit, mount, xOffset, yOffset, angle, mover); bullet(unit, mount, xOffset, yOffset, angle, mover);
} }
mount.totalShots++;
}); });
} }

4
servers_v6.json
View file

@ -139,4 +139,8 @@
"name": "OMNIDUSTRY", "name": "OMNIDUSTRY",
"address": ["109.94.209.233"] "address": ["109.94.209.233"]
} }
{
"name": "New Campaign Like",
"address": ["n5.yeet.ml:6568"]
},
] ]