mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed multiblock exploit

Browse Source
This commit is contained in:
Anuken 2019-04-04 23:53:51 -04:00
parent 45d157fe3f
commit 330820062f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,6 +222,8 @@ public class Damage{
if(scaledDamage <= 0 || tile == null) continue; if(scaledDamage <= 0 || tile == null) continue;
tile = tile.target();
//apply damage to entity if needed //apply damage to entity if needed
if(tile.entity != null && tile.getTeam() != team){ if(tile.entity != null && tile.getTeam() != team){
int health = (int)tile.entity.health; int health = (int)tile.entity.health;

4
core/src/io/anuke/mindustry/ui/Minimap.java
View File

@ -79,10 +79,10 @@ public class Minimap extends Container<Element>{
} }
super.touchDragged(event, x, y, pointer); super.touchDragged(event, x, y, pointer);
//if(mobile){ if(mobile){
float max = Math.min(world.width(), world.height()) / 16f / 2f; float max = Math.min(world.width(), world.height()) / 16f / 2f;
renderer.minimap.setZoom(1f + y / height * (max - 1f)); renderer.minimap.setZoom(1f + y / height * (max - 1f));
//} }
} }
@Override @Override