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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-10-28 22:27:26 -04:00
parent 850a3cfb4e 330ed9d390
commit fc900bec58
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/async/PhysicsProcess.java
View File

@@ -38,7 +38,7 @@ public class PhysicsProcess implements AsyncProcess{
//find Unit without bodies and assign them
for(Unit entity : group){
if(entity.type == null) continue;
if(entity == null || entity.type == null) continue;
if(entity.physref == null){
PhysicsBody body = new PhysicsBody();

8
core/src/mindustry/type/Weapon.java
View File

@@ -177,12 +177,8 @@ public class Weapon implements Cloneable{
Drawf.shadow(wx, wy, shadow);
}
if(outlineRegion.found() && top){
Draw.rect(outlineRegion,
wx, wy,
outlineRegion.width * Draw.scl * -Mathf.sign(flipSprite),
region.height * Draw.scl,
weaponRotation);
if(top){
drawOutline(unit, mount);
}
Draw.rect(region,

10
core/src/mindustry/world/blocks/storage/Unloader.java
View File

@@ -85,8 +85,9 @@ public class Unloader extends Block{
if(sortItem != null){
item = sortItem;
for(int pos = 0; pos < proximity.size; pos++){
var other = proximity.get(pos);
for(int j = 0; j < proximity.size; j++){
int pos = (offset + j) % proximity.size;
var other = proximity.get(j);
boolean interactable = other.interactable(team);
//set the stats of all buildings in possibleBlocks
@@ -105,8 +106,9 @@ public class Unloader extends Block{
boolean isDistinct = false;
Item possibleItem = content.item(total);
for(int pos = 0; pos < proximity.size; pos++){
var other = proximity.get(pos);
for(int j = 0; j < proximity.size; j++){
int pos = (offset + j) % proximity.size;
var other = proximity.get(j);
boolean interactable = other.interactable(team);
//set the stats of all buildings in possibleBlocks while we are at it