TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix Suffocate Conflicts

Browse source 
Conflicts:
	src/com/projectkorra/ProjectKorra/airbending/Suffocate.java
This commit is contained in:
MistPhizzle 2014-08-27 20:54:26 -04:00
parent 691fe098ea
commit 2a9d3640c7
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/com/projectkorra/ProjectKorra/airbending/Suffocate.java
View file

@ -45,7 +45,6 @@ public class Suffocate {
if (AvatarState.isAvatarState(player)) { if (AvatarState.isAvatarState(player)) {
range = AvatarState.getValue(range); range = AvatarState.getValue(range);
<<<<<<< HEAD
for (Entity entity: Methods.getEntitiesAroundPoint(player.getLocation(), range)) { for (Entity entity: Methods.getEntitiesAroundPoint(player.getLocation(), range)) {
if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId()) { if (entity instanceof LivingEntity && entity.getEntityId() != player.getEntityId()) {
targets.put(entity, entity.getLocation()); targets.put(entity, entity.getLocation());
@ -55,28 +54,7 @@ public class Suffocate {
Entity en = Methods.getTargetedEntity(player, range, new ArrayList<Entity>()); Entity en = Methods.getTargetedEntity(player, range, new ArrayList<Entity>());
if (en != null && en instanceof LivingEntity && en.getEntityId() != player.getEntityId()) { if (en != null && en instanceof LivingEntity && en.getEntityId() != player.getEntityId()) {
targets.put(en, en.getLocation()); targets.put(en, en.getLocation());
=======
for (Entity entity : Methods.getEntitiesAroundPoint(player.getLocation(), range)) {
if (entity instanceof LivingEntity) {
if (entity instanceof Player) {
if (Methods.isRegionProtectedFromBuild(player, "Suffocate", entity.getLocation()) || entity.getEntityId() == player.getEntityId())
continue;
}
if (System.currentTimeMillis() >= time + warmup) {
Methods.damageEntity(player, entity, 0);
}
targetentities.put(entity, entity.getLocation().clone());
}
}
} else {
Entity target = Methods.getTargetedEntity(player, range, new ArrayList<Entity>());
if (target == null)
return;
if (!(target instanceof LivingEntity)|| Methods.isRegionProtectedFromBuild(player, "Suffocate", target.getLocation()))
return;
if (!canBeUsedOnUndead && isUndead(target)) {
return;
>>>>>>> origin/master
} }
} }
@ -165,7 +143,6 @@ public class Suffocate {
new TempPotionEffect((LivingEntity) entity, nausea); new TempPotionEffect((LivingEntity) entity, nausea);
if (System.currentTimeMillis() >= time + warmup) { if (System.currentTimeMillis() >= time + warmup) {
Methods.damageEntity(player, entity, damage); Methods.damageEntity(player, entity, damage);
// entity.teleport(entity);
} }
} }
} catch (ConcurrentModificationException e) { } catch (ConcurrentModificationException e) {