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

Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors

Browse Source
This commit is contained in:
Anuken
2018-10-20 13:21:05 -04:00
parent 6ed4e2d946 4d6c25c9d3
commit c71fee3fed
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/entities/Units.java
View File

@@ -86,6 +86,7 @@ public class Units{
for(EntityGroup<? extends BaseUnit> g : unitGroups){ for(EntityGroup<? extends BaseUnit> g : unitGroups){
g.forEach(u -> { g.forEach(u -> {
if(u.isFlying()) return;
u.getHitbox(rectGraphics); u.getHitbox(rectGraphics);
if(rectGraphics.overlaps(rect)){ if(rectGraphics.overlaps(rect)){
boolResultGraphics = true; boolResultGraphics = true;
@@ -95,6 +96,7 @@ public class Units{
} }
playerGroup.forEach(u -> { playerGroup.forEach(u -> {
if(u.isFlying()) return;
u.getHitbox(rectGraphics); u.getHitbox(rectGraphics);
if(rectGraphics.overlaps(rect)){ if(rectGraphics.overlaps(rect)){
boolResultGraphics = true; boolResultGraphics = true;