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

Various Fixes (#591)

Browse source 
* Fix Spout speed limiting

* Fix Tremorsense, particle distance, help autotabbing, and sandspout flight
This commit is contained in:
Christopher Martin 2016-10-08 21:32:09 -07:00 committed by GitHub
parent 2fd345de8a
commit fad2f5542b
12 changed files with 43 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -467,13 +467,13 @@ public class GeneralMethods {
loc.setZ(loc.getZ() + Math.random() * (zOffset / 2 - -(zOffset / 2))); loc.setZ(loc.getZ() + Math.random() * (zOffset / 2 - -(zOffset / 2)));
if (type == ParticleEffect.RED_DUST || type == ParticleEffect.REDSTONE) { if (type == ParticleEffect.RED_DUST || type == ParticleEffect.REDSTONE) {
ParticleEffect.RED_DUST.display(R, G, B, 0.004F, 0, loc, 257D); ParticleEffect.RED_DUST.display(R, G, B, 0.004F, 0, loc, 255.0);
} else if (type == ParticleEffect.SPELL_MOB || type == ParticleEffect.MOB_SPELL) { } else if (type == ParticleEffect.SPELL_MOB || type == ParticleEffect.MOB_SPELL) {
ParticleEffect.SPELL_MOB.display((float) 255 - R, (float) 255 - G, (float) 255 - B, 1, 0, loc, 257D); ParticleEffect.SPELL_MOB.display((float) 255 - R, (float) 255 - G, (float) 255 - B, 1, 0, loc, 255.0);
} else if (type == ParticleEffect.SPELL_MOB_AMBIENT || type == ParticleEffect.MOB_SPELL_AMBIENT) { } else if (type == ParticleEffect.SPELL_MOB_AMBIENT || type == ParticleEffect.MOB_SPELL_AMBIENT) {
ParticleEffect.SPELL_MOB_AMBIENT.display((float) 255 - R, (float) 255 - G, (float) 255 - B, 1, 0, loc, 257D); ParticleEffect.SPELL_MOB_AMBIENT.display((float) 255 - R, (float) 255 - G, (float) 255 - B, 1, 0, loc, 255.0);
} else { } else {
ParticleEffect.RED_DUST.display(0, 0, 0, 0.004F, 0, loc, 257D); ParticleEffect.RED_DUST.display(0, 0, 0, 0.004F, 0, loc, 255.0D);
} }
} }

2
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -1573,7 +1573,7 @@ public class PKListener implements Listener {
new EarthGrab(player, true); new EarthGrab(player, true);
} }
if (abil.equalsIgnoreCase("Tremorsense")) { if (abil.equalsIgnoreCase("Tremorsense")) {
new Tremorsense(player); new Tremorsense(player, true);
} }
if (abil.equalsIgnoreCase("MetalClips")) { if (abil.equalsIgnoreCase("MetalClips")) {
MetalClips clips = CoreAbility.getAbility(player, MetalClips.class); MetalClips clips = CoreAbility.getAbility(player, MetalClips.class);

8
src/com/projectkorra/projectkorra/ability/EarthAbility.java
View file

@ -272,11 +272,11 @@ public abstract class EarthAbility extends ElementalAbility {
for (int x = 0; x < amount; x++) { for (int x = 0; x < amount; x++) {
if (!red) { if (!red) {
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.SAND, (byte) 0), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.SAND, (byte) 0), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 255.0);
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.SANDSTONE, (byte) 0), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.SANDSTONE, (byte) 0), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 255.0);
} else if (red) { } else if (red) {
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.SAND, (byte) 1), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.SAND, (byte) 1), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 255.0);
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.RED_SANDSTONE, (byte) 0), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.RED_SANDSTONE, (byte) 0), new Vector(((Math.random() - 0.5) * xOffset), ((Math.random() - 0.5) * yOffset), ((Math.random() - 0.5) * zOffset)), speed, loc, 255.0);
} }
} }

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

@ -165,7 +165,7 @@ public class HelpCommand extends PKCommand {
abils.add(coreAbil.getName()); abils.add(coreAbil.getName());
} else if (sender instanceof Player) { } else if (sender instanceof Player) {
BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(sender.getName()); BendingPlayer bPlayer = BendingPlayer.getBendingPlayer(sender.getName());
if (bPlayer.canBind(coreAbil) || (coreAbil instanceof ComboAbility)) { if (bPlayer.canBind(coreAbil) || ((coreAbil instanceof ComboAbility) && bPlayer.hasElement(coreAbil.getElement()))) {
abils.add(coreAbil.getName()); abils.add(coreAbil.getName());
} }
} }

9
src/com/projectkorra/projectkorra/earthbending/SandSpout.java
View file

@ -26,6 +26,8 @@ public class SandSpout extends SandAbility {
private double damage; private double damage;
private double height; private double height;
private double currentHeight; private double currentHeight;
private boolean couldFly;
private boolean wasFlying;
private Flight flight; private Flight flight;
public SandSpout(Player player) { public SandSpout(Player player) {
@ -39,6 +41,9 @@ public class SandSpout extends SandAbility {
this.blindnessTime = getConfig().getInt("Abilities.Earth.SandSpout.BlindnessTime"); this.blindnessTime = getConfig().getInt("Abilities.Earth.SandSpout.BlindnessTime");
this.damage = getConfig().getInt("Abilities.Earth.SandSpout.SpoutDamage"); this.damage = getConfig().getInt("Abilities.Earth.SandSpout.SpoutDamage");
this.couldFly = player.getAllowFlight();
this.wasFlying = player.isFlying();
SandSpout oldSandSpout = getAbility(player, SandSpout.class); SandSpout oldSandSpout = getAbility(player, SandSpout.class);
if (oldSandSpout != null) { if (oldSandSpout != null) {
oldSandSpout.remove(); oldSandSpout.remove();
@ -110,8 +115,8 @@ public class SandSpout extends SandAbility {
} }
private void removeFlight() { private void removeFlight() {
player.setAllowFlight(false); player.setAllowFlight(couldFly);
player.setFlying(false); player.setFlying(wasFlying);
} }
private Block getGround() { private Block getGround() {

27
src/com/projectkorra/projectkorra/earthbending/Tremorsense.java
View file

@ -25,26 +25,31 @@ public class Tremorsense extends EarthAbility {
private long cooldown; private long cooldown;
private Block block; private Block block;
public Tremorsense(Player player) { public Tremorsense(Player player, boolean clicked) {
super(player); super(player);
this.maxDepth = getConfig().getInt("Abilities.Earth.Tremorsense.MaxDepth");
this.radius = getConfig().getInt("Abilities.Earth.Tremorsense.Radius");
this.lightThreshold = (byte) getConfig().getInt("Abilities.Earth.Tremorsense.LightThreshold");
this.cooldown = getConfig().getLong("Abilities.Earth.Tremorsense.Cooldown");
if (!bPlayer.canBendIgnoreBinds(this)) { if (!bPlayer.canBendIgnoreBinds(this)) {
return; return;
} }
setFields();
byte lightLevel = player.getLocation().getBlock().getLightLevel(); byte lightLevel = player.getLocation().getBlock().getLightLevel();
if (lightLevel < this.lightThreshold && isEarthbendable(player.getLocation().getBlock().getRelative(BlockFace.DOWN))) { if (lightLevel < this.lightThreshold && isEarthbendable(player.getLocation().getBlock().getRelative(BlockFace.DOWN))) {
bPlayer.addCooldown(this); if(clicked) {
activate(); bPlayer.addCooldown(this);
activate();
}
start(); start();
} }
} }
private void setFields() {
this.maxDepth = getConfig().getInt("Abilities.Earth.Tremorsense.MaxDepth");
this.radius = getConfig().getInt("Abilities.Earth.Tremorsense.Radius");
this.lightThreshold = (byte) getConfig().getInt("Abilities.Earth.Tremorsense.LightThreshold");
this.cooldown = getConfig().getLong("Abilities.Earth.Tremorsense.Cooldown");
}
private void activate() { private void activate() {
Block block = player.getLocation().getBlock().getRelative(BlockFace.DOWN); Block block = player.getLocation().getBlock().getRelative(BlockFace.DOWN);
@ -133,7 +138,7 @@ public class Tremorsense extends EarthAbility {
for (Player player : server.getOnlinePlayers()) { for (Player player : server.getOnlinePlayers()) {
if (canTremorSense(player) && !hasAbility(player, Tremorsense.class)) { if (canTremorSense(player) && !hasAbility(player, Tremorsense.class)) {
new Tremorsense(player); new Tremorsense(player, false);
} }
} }
} }
@ -213,4 +218,4 @@ public class Tremorsense extends EarthAbility {
this.cooldown = cooldown; this.cooldown = cooldown;
} }
} }

2
src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
View file

@ -181,7 +181,7 @@ public class FireBlastCharged extends FireAbility {
} }
} }
location.getWorld().playSound(location, Sound.ENTITY_GENERIC_EXPLODE, 5, 1); location.getWorld().playSound(location, Sound.ENTITY_GENERIC_EXPLODE, 5, 1);
ParticleEffect.EXPLOSION_HUGE.display(new Vector(0, 0, 0), 0, location, 256); ParticleEffect.EXPLOSION_HUGE.display(new Vector(0, 0, 0), 0, location, 255.0D);
} }
} }

6
src/com/projectkorra/projectkorra/waterbending/IceBlast.java
View file

@ -164,7 +164,7 @@ public class IceBlast extends IceAbility {
AirAbility.breakBreathbendingHold(entity); AirAbility.breakBreathbendingHold(entity);
for (int x = 0; x < 30; x++) { for (int x = 0; x < 30; x++) {
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), .3f, location, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), .3f, location, 255.0);
} }
} }
@ -289,7 +289,7 @@ public class IceBlast extends IceAbility {
source = new TempBlock(sourceBlock, Material.PACKED_ICE, data); source = new TempBlock(sourceBlock, Material.PACKED_ICE, data);
for (int x = 0; x < 10; x++) { for (int x = 0; x < 10; x++) {
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), .5f, location, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), .5f, location, 255.0);
ParticleEffect.SNOW_SHOVEL.display(location, (float) (Math.random() - 0.5), (float) (Math.random() - 0.5), (float) (Math.random() - 0.5), 0, 5); ParticleEffect.SNOW_SHOVEL.display(location, (float) (Math.random() - 0.5), (float) (Math.random() - 0.5), (float) (Math.random() - 0.5), 0, 5);
} }
if ((new Random()).nextInt(4) == 0) { if ((new Random()).nextInt(4) == 0) {
@ -303,7 +303,7 @@ public class IceBlast extends IceAbility {
public void breakParticles(int amount) { public void breakParticles(int amount) {
for (int x = 0; x < amount; x++) { for (int x = 0; x < amount; x++) {
ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), 2f, location, 257.0D); ParticleEffect.ITEM_CRACK.display(new ParticleEffect.ItemData(Material.ICE, (byte) 0), new Vector(((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5), ((Math.random() - 0.5) * .5)), 2f, location, 255.0);
ParticleEffect.SNOW_SHOVEL.display(location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 2); ParticleEffect.SNOW_SHOVEL.display(location, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0, 2);
} }
location.getWorld().playSound(location, Sound.BLOCK_GLASS_BREAK, 5, 1.3f); location.getWorld().playSound(location, Sound.BLOCK_GLASS_BREAK, 5, 1.3f);

4
src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
View file

@ -385,13 +385,13 @@ public class OctopusForm extends WaterAbility {
tblock.setType(Material.WATER, FULL); tblock.setType(Material.WATER, FULL);
} }
if (isWater(block) && !TempBlock.isTempBlock(block)) { if (isWater(block) && !TempBlock.isTempBlock(block)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(0.5, 0.5, 0.5), 257D); ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(0.5, 0.5, 0.5), 255.0);
} }
newBlocks.add(tblock); newBlocks.add(tblock);
} }
} else if (isWaterbendable(player, block) || block.getType() == Material.FIRE || block.getType() == Material.AIR) { } else if (isWaterbendable(player, block) || block.getType() == Material.FIRE || block.getType() == Material.AIR) {
if (isWater(block) && !TempBlock.isTempBlock(block)) { if (isWater(block) && !TempBlock.isTempBlock(block)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(0.5, 0.5, 0.5), 257D); ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, block.getLocation().clone().add(0.5, 0.5, 0.5), 255.0);
} }
newBlocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 8)); newBlocks.add(new TempBlock(block, Material.STATIONARY_WATER, (byte) 8));
} }

4
src/com/projectkorra/projectkorra/waterbending/Torrent.java
View file

@ -223,7 +223,7 @@ public class Torrent extends WaterAbility {
double dz = Math.sin(phi) * radius; double dz = Math.sin(phi) * radius;
loc.add(dx, dy, dz); loc.add(dx, dy, dz);
if(GeneralMethods.isAdjacentToThreeOrMoreSources(loc.getBlock())) { if(GeneralMethods.isAdjacentToThreeOrMoreSources(loc.getBlock())) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, loc.getBlock().getLocation().clone().add(.5,.5,.5), 257D); ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, loc.getBlock().getLocation().clone().add(.5,.5,.5), 255.0);
} }
loc.subtract(dx, dy, dz); loc.subtract(dx, dy, dz);
} }
@ -362,7 +362,7 @@ public class Torrent extends WaterAbility {
} }
if (locBlock.getLocation().distanceSquared(targetLoc) > 1) { if (locBlock.getLocation().distanceSquared(targetLoc) > 1) {
if (isWater(locBlock)) { if (isWater(locBlock)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, locBlock.getLocation().clone().add(.5,.5,.5), 257D); ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, locBlock.getLocation().clone().add(.5,.5,.5), 255.0);
} }
newBlocks.add(new TempBlock(locBlock, Material.STATIONARY_WATER, (byte) 8)); newBlocks.add(new TempBlock(locBlock, Material.STATIONARY_WATER, (byte) 8));
} else { } else {

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

@ -380,7 +380,7 @@ public class WaterManipulation extends WaterAbility {
} else { } else {
if (isWater(block) && !AFFECTED_BLOCKS.containsKey(block)) { if (isWater(block) && !AFFECTED_BLOCKS.containsKey(block)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f,
5, block.getLocation().clone().add(.5, .5, .5), 257D); 5, block.getLocation().clone().add(.5, .5, .5), 255.0);
} }
} }

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

@ -82,7 +82,7 @@ public class WaterReturn extends WaterAbility {
block = new TempBlock(newblock, Material.WATER, (byte) 0); block = new TempBlock(newblock, Material.WATER, (byte) 0);
} else if (isTransparent(player, newblock)) { } else if (isTransparent(player, newblock)) {
if (isWater(newblock)) { if (isWater(newblock)) {
ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, newblock.getLocation().clone().add(.5,.5,.5), 257D); ParticleEffect.WATER_BUBBLE.display((float) Math.random(), (float) Math.random(), (float) Math.random(), 0f, 5, newblock.getLocation().clone().add(.5,.5,.5), 255.0);
} }
} else { } else {
remove(); remove();