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

Merge remote-tracking branch 'refs/remotes/ProjectKorra/master'

Browse source
This commit is contained in:
Benford 2016-01-29 16:38:12 -05:00
commit a8b6f1ea7f
11 changed files with 46 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lib/ProjectKorraRPG.jar
View file

Binary file not shown.

12
src/com/projectkorra/projectkorra/airbending/Suffocate.java
View file

@ -130,8 +130,16 @@ public class Suffocate implements ConfigLoadable {
targets.add((LivingEntity) ent);
} else {
//Entity ent = GeneralMethods.getTargetedEntity(player, range, new ArrayList<Entity>());
Location location = GeneralMethods.getTargetedLocation(player, 6, transparent);
List<Entity> entities = GeneralMethods.getEntitiesAroundPoint(location, 1.5);
List<Entity> entities = new ArrayList<Entity>();
for (int i = 0; i < 6; i++) {
Location location = GeneralMethods.getTargetedLocation(player, i, transparent);
entities = GeneralMethods.getEntitiesAroundPoint(location, 1.7);
if (entities.contains(player))
entities.remove(player);
if (entities != null && !entities.isEmpty() && !entities.contains(player)) {
break;
}
}
if (entities == null || entities.isEmpty()) {
return;
}

3
src/com/projectkorra/projectkorra/chiblocking/ChiCombo.java
View file

@ -100,6 +100,9 @@ public class ChiCombo {
remove.add(instances.indexOf(c));
}
for (int i : remove) {
if (i >= instances.size()) {
continue;
}
instances.remove(i);
}
}

4
src/com/projectkorra/projectkorra/command/HelpCommand.java
View file

@ -32,7 +32,7 @@ public class HelpCommand extends PKCommand {
else if (args.size() == 0) {
List<String> strings = new ArrayList<String>();
for (PKCommand command : instances.values()) {
if (!command.getName().equalsIgnoreCase("help")) {
if (!command.getName().equalsIgnoreCase("help") && sender.hasPermission("bending.command." + command.getName())) {
strings.add(command.getProperUse());
}
}
@ -51,7 +51,7 @@ public class HelpCommand extends PKCommand {
if (isNumeric(arg)) {
List<String> strings = new ArrayList<String>();
for (PKCommand command : instances.values()) {
if (!command.getName().equalsIgnoreCase("help")) {
if (!command.getName().equalsIgnoreCase("help") && sender.hasPermission("bending.command." + command.getName())) {
strings.add(command.getProperUse());
}
}

1
src/com/projectkorra/projectkorra/command/RemoveCommand.java
View file

@ -43,6 +43,7 @@ public class RemoveCommand extends PKCommand {
return;
}
sender.sendMessage(GeneralMethods.getElementColor(e) + "You have removed your " + e.toString().toLowerCase() + "bending.");
Bukkit.getServer().getPluginManager().callEvent(new PlayerChangeElementEvent(sender, (Player) sender, e, Result.REMOVE));
return;
} else {
sender.sendMessage(ChatColor.RED + "You do not have that element!");

4
src/com/projectkorra/projectkorra/earthbending/EarthMethods.java
View file

@ -697,8 +697,8 @@ public class EarthMethods {
if (sourceblock.getType() == Material.AIR || sourceblock.isLiquid()) {
info.getState().update(true);
} else {
GeneralMethods.dropItems(block,
GeneralMethods.getDrops(block, info.getState().getType(), info.getState().getRawData(), pickaxe));
// GeneralMethods.dropItems(block,
// GeneralMethods.getDrops(block, info.getState().getType(), info.getState().getRawData(), pickaxe));
}
if (GeneralMethods.isAdjacentToThreeOrMoreSources(block)) {

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

@ -503,6 +503,9 @@ public class EarthSmash {
for (EarthSmash smash : instances) {
if (reqState == null || smash.state == reqState)
for (Block block : blocks) {
if (block == null || smash.loc == null) {
continue;
}
if (block.getLocation().getWorld() == smash.loc.getWorld() && block.getLocation().distanceSquared(smash.loc) <= Math.pow(2.5, 2))
return smash;
}

15
src/com/projectkorra/projectkorra/firebending/WallOfFire.java
View file

@ -17,7 +17,10 @@ import com.projectkorra.projectkorra.GeneralMethods;
import com.projectkorra.projectkorra.ability.AvatarState;
import com.projectkorra.projectkorra.airbending.AirMethods;
import com.projectkorra.projectkorra.configuration.ConfigLoadable;
import com.projectkorra.projectkorra.earthbending.EarthMethods;
import com.projectkorra.projectkorra.util.ParticleEffect;
import com.projectkorra.projectkorra.util.TempBlock;
import com.projectkorra.projectkorra.waterbending.WaterMethods;
public class WallOfFire implements ConfigLoadable {
@ -97,13 +100,18 @@ public class WallOfFire implements ConfigLoadable {
}
private void affect(Entity entity) {
entity.setFireTicks((int) (FIRETICKS * 20));
GeneralMethods.setVelocity(entity, new Vector(0, 0, 0));
if (entity instanceof LivingEntity) {
LivingEntity e = (LivingEntity) entity;
Block block = e.getEyeLocation().getBlock();
if (TempBlock.isTempBlock(block) && WaterMethods.isIcebendable(block)) {
return;
}
GeneralMethods.damageEntity(player, entity, damage, "WallOfFire");
new Enflamed(entity, player);
AirMethods.breakBreathbendingHold(entity);
}
entity.setFireTicks((int) (FIRETICKS * 20));
GeneralMethods.setVelocity(entity, new Vector(0, 0, 0));
}
private void damage() {
@ -128,6 +136,9 @@ public class WallOfFire implements ConfigLoadable {
private void display() {
for (Block block : blocks) {
if (!EarthMethods.isTransparentToEarthbending(player, block)) {
continue;
}
ParticleEffect.FLAME.display(block.getLocation(), 0.6F, 0.6F, 0.6F, 0, 3);
ParticleEffect.SMOKE.display(block.getLocation(), 0.6F, 0.6F, 0.6F, 0, 1);

2
src/com/projectkorra/projectkorra/object/Preset.java
View file

@ -147,7 +147,7 @@ public class Preset {
HashMap<Integer, String> abilities = (HashMap<Integer, String>) preset.abilities.clone();
boolean boundAll = true;
for (int i = 1; i <= 9; i++) {
if (!GeneralMethods.canBend(player.getName(), abilities.get(i))) {
if (!GeneralMethods.canBind(player.getName(), abilities.get(i))) {
abilities.remove(i);
boundAll = false;
}

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

@ -89,8 +89,16 @@ public class Bloodbending {
}
}
} else {
Location location = GeneralMethods.getTargetedLocation(player, 6, transparent);
List<Entity> entities = GeneralMethods.getEntitiesAroundPoint(location, 1.5);
List<Entity> entities = new ArrayList<Entity>();
for (int i = 0; i < 6; i++) {
Location location = GeneralMethods.getTargetedLocation(player, i, transparent);
entities = GeneralMethods.getEntitiesAroundPoint(location, 1.7);
if (entities.contains(player))
entities.remove(player);
if (entities != null && !entities.isEmpty() && !entities.contains(player)) {
break;
}
}
if (entities == null || entities.isEmpty()) {
return;
}

2
src/com/projectkorra/projectkorra/waterbending/HealingWaters.java
View file

@ -43,7 +43,7 @@ public class HealingWaters {
Entity entity = GeneralMethods.getTargetedEntity(player, range, new ArrayList<Entity>());
if (entity instanceof LivingEntity && inWater(entity) && player.isSneaking()) {
giveHPToEntity((LivingEntity) entity);
} else if ((player.isSneaking() && shift) || (player.isSneaking() && shift)){
} else if ((player.isSneaking() && shift) || !shift){
giveHP(player);
}
}