TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-08-05 12:03:17 +00:00
Code Issues Projects Releases Wiki Activity

Fixed Bloodbending (Still needs tweaking)

Browse source 
Fixed Bloodbending not working in avatarstate. Range still needs to be
fixed.
This commit is contained in:
StrangeOne101 2015-08-04 17:52:37 +12:00
parent e0833241f5
commit ce748a4ee8
1 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/com/projectkorra/projectkorra/waterbending/Bloodbending.java
View file

@ -65,11 +65,11 @@ public class Bloodbending {
range = (int) WaterMethods.waterbendingNightAugment(range, player.getWorld()); range = (int) WaterMethods.waterbendingNightAugment(range, player.getWorld());
if (AvatarState.isAvatarState(player)) { if (AvatarState.isAvatarState(player)) {
range = AvatarState.getValue(range); range += AvatarState.getValue(range);
for (Entity entity : GeneralMethods.getEntitiesAroundPoint(player.getLocation(), range)) { for (Entity entity : GeneralMethods.getEntitiesAroundPoint(player.getLocation(), range)) {
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
if (entity instanceof Player) { if (entity instanceof Player) {
if (GeneralMethods.isRegionProtectedFromBuild(player, "Bloodbending", entity.getLocation()) || (AvatarState.isAvatarState((Player) entity) || entity.getEntityId() != player.getEntityId() || GeneralMethods.canBend(((Player) entity).getName(), "Bloodbending"))) if (GeneralMethods.isRegionProtectedFromBuild(player, "Bloodbending", entity.getLocation()) || (AvatarState.isAvatarState((Player) entity) || entity.getEntityId() == player.getEntityId() || GeneralMethods.canBend(((Player) entity).getName(), "Bloodbending")))
continue; continue;
} }
GeneralMethods.damageEntity(player, entity, 0); GeneralMethods.damageEntity(player, entity, 0);
@ -109,11 +109,9 @@ public class Bloodbending {
instances.get(player).launch(); instances.get(player).launch();
} }
@SuppressWarnings("unused")
private void launch() { private void launch() {
Location location = player.getLocation(); Location location = player.getLocation();
for (Entity entity : targetentities.keySet()) { for (Entity entity : targetentities.keySet()) {
double dx, dy, dz;
Location target = entity.getLocation().clone(); Location target = entity.getLocation().clone();
// dx = target.getX() - location.getX(); // dx = target.getX() - location.getX();
// dy = target.getY() - location.getY(); // dy = target.getY() - location.getY();
@ -173,11 +171,11 @@ public class Bloodbending {
if (AvatarState.isAvatarState(player)) { if (AvatarState.isAvatarState(player)) {
ArrayList<Entity> entities = new ArrayList<Entity>(); ArrayList<Entity> entities = new ArrayList<Entity>();
for (Entity entity : GeneralMethods.getEntitiesAroundPoint(player.getLocation(), range)) { for (Entity entity : GeneralMethods.getEntitiesAroundPoint(player.getLocation(), 10)) {
if (GeneralMethods.isRegionProtectedFromBuild(player, "Bloodbending", entity.getLocation())) if (GeneralMethods.isRegionProtectedFromBuild(player, "Bloodbending", entity.getLocation()))
continue; continue;
if (entity instanceof Player) { if (entity instanceof Player) {
if (!WaterMethods.canBeBloodbent((Player) entity)) if (!WaterMethods.canBeBloodbent((Player) entity) || entity.getEntityId() == player.getEntityId())
continue; continue;
} }
entities.add(entity); entities.add(entity);
@ -185,8 +183,10 @@ public class Bloodbending {
GeneralMethods.damageEntity(player, entity, 0); GeneralMethods.damageEntity(player, entity, 0);
targetentities.put(entity, entity.getLocation().clone()); targetentities.put(entity, entity.getLocation().clone());
} }
}
for (Entity entity : targetentities.keySet()) {
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
Location newlocation = entity.getLocation().clone(); /*Location newlocation = entity.getLocation().clone();
Location location = targetentities.get(entity); Location location = targetentities.get(entity);
double distance = location.distance(newlocation); double distance = location.distance(newlocation);
double dx, dy, dz; double dx, dy, dz;
@ -204,13 +204,36 @@ public class Bloodbending {
if (entity instanceof Creature) { if (entity instanceof Creature) {
((Creature) entity).setTarget(null); ((Creature) entity).setTarget(null);
} }
AirMethods.breakBreathbendingHold(entity);*/
Location newlocation = entity.getLocation();
if (player.getWorld() != newlocation.getWorld()) {
targetentities.remove(entity);
continue;
}
Location location = GeneralMethods.getTargetedLocation(player, 6);//GeneralMethods.getTargetedLocation(player, 6);
double distance = location.distance(newlocation);
double dx, dy, dz;
dx = location.getX() - newlocation.getX();
dy = location.getY() - newlocation.getY();
dz = location.getZ() - newlocation.getZ();
Vector vector = new Vector(dx, dy, dz);
if (distance > .5) {
entity.setVelocity(vector.normalize().multiply(.5));
} else {
entity.setVelocity(new Vector(0, 0, 0));
}
new TempPotionEffect((LivingEntity) entity, effect);
entity.setFallDistance(0);
if (entity instanceof Creature) {
((Creature) entity).setTarget(null);
}
AirMethods.breakBreathbendingHold(entity); AirMethods.breakBreathbendingHold(entity);
} }
} }
for (Entity entity : targetentities.keySet()) { /*for (Entity entity : targetentities.keySet()) {
if (!entities.contains(entity)) if (!entities.contains(entity))
targetentities.remove(entity); targetentities.remove(entity);
} }*/
} else { } else {
for (Entity entity : targetentities.keySet()) { for (Entity entity : targetentities.keySet()) {
if (entity instanceof Player) { if (entity instanceof Player) {
@ -224,26 +247,7 @@ public class Bloodbending {
targetentities.remove(entity); targetentities.remove(entity);
continue; continue;
} }
Location location = GeneralMethods.getTargetedLocation(player, 6 /* Location location = GeneralMethods.getTargetedLocation(player, 6);
* (
* int
* )
* targetentities
* .
* get
* (
* entity
* )
* .
* distance
* (
* player
* .
* getLocation
* (
* )
* )
*/);
double distance = location.distance(newlocation); double distance = location.distance(newlocation);
double dx, dy, dz; double dx, dy, dz;
dx = location.getX() - newlocation.getX(); dx = location.getX() - newlocation.getX();