Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken
2021-03-17 20:53:09 -04:00

View File

@@ -337,12 +337,7 @@ public class Damage{
/** Damages all entities and blocks in a radius that are enemies of the team. */
public static void damage(Team team, float x, float y, float radius, float damage, boolean complete, boolean air, boolean ground){
Cons<Unit> cons
= entity -> {
Cons<Unit> cons = entity -> {
if(entity.team == team || !entity.within(x, y, radius) || (entity.isFlying() && !air) || (entity.isGrounded() && !ground)){
return;
}