TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-12-23 00:15:05 +00:00
Code Issues Projects Releases Wiki Activity

some more protection checks for earthsmash

Browse source
This commit is contained in:
PhanaticD 2019-01-20 06:40:35 -05:00
parent 1c15f9209e
commit 6e615c75eb
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
View file

@ -5,6 +5,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.EarthAbility;
import com.projectkorra.projectkorra.ability.ElementalAbility;
import com.projectkorra.projectkorra.attribute.Attribute;
import com.projectkorra.projectkorra.command.Commands;
import com.projectkorra.projectkorra.util.ClickType;
import com.projectkorra.projectkorra.util.DamageHandler;
import com.projectkorra.projectkorra.util.ParticleEffect;
@ -288,6 +289,9 @@ public class EarthSmash extends EarthAbility {
return;
}
for (final Entity entity : entities) {
if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
continue;
}
entity.setVelocity(direction.clone().multiply(this.flightSpeed));
}
@ -561,6 +565,9 @@ public class EarthSmash extends EarthAbility {
final List<Entity> entities = GeneralMethods.getEntitiesAroundPoint(this.location, this.flightDetectionRadius);
for (final Entity entity : entities) {
if (entity instanceof LivingEntity && entity != this.player && !this.affectedEntities.contains(entity)) {
if (GeneralMethods.isRegionProtectedFromBuild(this, entity.getLocation()) || ((entity instanceof Player) && Commands.invincible.contains(((Player) entity).getName()))) {
continue;
}
this.affectedEntities.add(entity);
final double damage = this.currentBlocks.size() / 13.0 * this.damage;
DamageHandler.damageEntity(entity, damage, this);