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

Changed method name and classes effected

Browse source
This commit is contained in:
jack lin 2014-07-29 23:34:46 +12:00
parent c2878ba36a
commit 468ffa3325
11 changed files with 1422 additions and 1139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2509
src/com/projectkorra/ProjectKorra/Methods.java
View file

File diff suppressed because it is too large Load diff

2
src/com/projectkorra/ProjectKorra/firebending/ArcOfFire.java
View file

@ -38,7 +38,7 @@ public class ArcOfFire {
Location location = player.getLocation(); Location location = player.getLocation();
int arc = (int) Methods.firebendingDayAugment(defaultarc, int arc = (int) Methods.getFirebendingDayAugment(defaultarc,
player.getWorld()); player.getWorld());
for (int i = -arc; i <= arc; i += stepsize) { for (int i = -arc; i <= arc; i += stepsize) {

4
src/com/projectkorra/ProjectKorra/firebending/Extinguish.java
View file

@ -31,12 +31,12 @@ public class Extinguish {
} }
} }
double range = Methods.firebendingDayAugment(defaultrange, player.getWorld()); double range = Methods.getFirebendingDayAugment(defaultrange, player.getWorld());
if (Methods.isMeltable(player.getTargetBlock(null, (int) range))) { if (Methods.isMeltable(player.getTargetBlock(null, (int) range))) {
new HeatMelt(player); new HeatMelt(player);
return; return;
} }
double radius = Methods.firebendingDayAugment(defaultradius, player.getWorld()); double radius = Methods.getFirebendingDayAugment(defaultradius, player.getWorld());
for (Block block : Methods.getBlocksAroundPoint( for (Block block : Methods.getBlocksAroundPoint(
player.getTargetBlock(null, (int) range).getLocation(), radius)) { player.getTargetBlock(null, (int) range).getLocation(), radius)) {
if (Methods.isRegionProtectedFromBuild(player, "Blaze", if (Methods.isRegionProtectedFromBuild(player, "Blaze",

6
src/com/projectkorra/ProjectKorra/firebending/FireBlast.java
View file

@ -73,7 +73,7 @@ public class FireBlast {
if (player.getEyeLocation().getBlock().isLiquid() || Fireball.isCharging(player)) { if (player.getEyeLocation().getBlock().isLiquid() || Fireball.isCharging(player)) {
return; return;
} }
range = Methods.firebendingDayAugment(range, player.getWorld()); range = Methods.getFirebendingDayAugment(range, player.getWorld());
// timers.put(player, System.currentTimeMillis()); // timers.put(player, System.currentTimeMillis());
this.player = player; this.player = player;
location = player.getEyeLocation(); location = player.getEyeLocation();
@ -95,7 +95,7 @@ public class FireBlast {
return; return;
} }
safe = safeblocks; safe = safeblocks;
range = Methods.firebendingDayAugment(range, player.getWorld()); range = Methods.getFirebendingDayAugment(range, player.getWorld());
// timers.put(player, System.currentTimeMillis()); // timers.put(player, System.currentTimeMillis());
this.player = player; this.player = player;
this.location = location.clone(); this.location = location.clone();
@ -219,7 +219,7 @@ public class FireBlast {
} }
if (entity instanceof LivingEntity) { if (entity instanceof LivingEntity) {
entity.setFireTicks(50); entity.setFireTicks(50);
Methods.damageEntity(player, entity, (int) Methods.firebendingDayAugment((double) damage, entity.getWorld())); Methods.damageEntity(player, entity, (int) Methods.getFirebendingDayAugment((double) damage, entity.getWorld()));
new Enflamed(entity, player); new Enflamed(entity, player);
instances.remove(id); instances.remove(id);
} }

2
src/com/projectkorra/ProjectKorra/firebending/FireJet.java
View file

@ -55,7 +55,7 @@ public class FireJet {
} }
} }
factor = Methods.firebendingDayAugment(defaultfactor, player.getWorld()); factor = Methods.getFirebendingDayAugment(defaultfactor, player.getWorld());
Block block = player.getLocation().getBlock(); Block block = player.getLocation().getBlock();
if (FireStream.isIgnitable(player, block) || block.getType() == Material.AIR || AvatarState.isAvatarState(player)) { if (FireStream.isIgnitable(player, block) || block.getType() == Material.AIR || AvatarState.isAvatarState(player)) {
player.setVelocity(player.getEyeLocation().getDirection().clone().normalize().multiply(factor)); player.setVelocity(player.getEyeLocation().getDirection().clone().normalize().multiply(factor));

2
src/com/projectkorra/ProjectKorra/firebending/FireStream.java
View file

@ -41,7 +41,7 @@ public class FireStream {
private double range; private double range;
public FireStream(Location location, Vector direction, Player player, int range) { public FireStream(Location location, Vector direction, Player player, int range) {
this.range = Methods.firebendingDayAugment(range, player.getWorld()); this.range = Methods.getFirebendingDayAugment(range, player.getWorld());
this.player = player; this.player = player;
origin = location.clone(); origin = location.clone();
this.location = origin.clone(); this.location = origin.clone();

4
src/com/projectkorra/ProjectKorra/firebending/Fireball.java
View file

@ -53,7 +53,7 @@ public class Fireball {
chargetime = 0; chargetime = 0;
maxdamage = AvatarState.getValue(maxdamage); maxdamage = AvatarState.getValue(maxdamage);
} }
range = Methods.firebendingDayAugment(range, player.getWorld()); range = Methods.getFirebendingDayAugment(range, player.getWorld());
if (!player.getEyeLocation().getBlock().isLiquid()) { if (!player.getEyeLocation().getBlock().isLiquid()) {
id = ID; id = ID;
instances.put(id, this); instances.put(id, this);
@ -203,7 +203,7 @@ public class Fireball {
float yield = 1; float yield = 1;
if (!AvatarState.isAvatarState(player)) { if (!AvatarState.isAvatarState(player)) {
if (Methods.isDay(player.getWorld())) { if (Methods.isDay(player.getWorld())) {
Methods.firebendingDayAugment(yield, player.getWorld()); Methods.getFirebendingDayAugment(yield, player.getWorld());
} else { } else {
yield *= 1.; yield *= 1.;
} }

4
src/com/projectkorra/ProjectKorra/firebending/HeatMelt.java
View file

@ -16,9 +16,9 @@ public class HeatMelt {
public HeatMelt(Player player) { public HeatMelt(Player player) {
Location location = Methods.getTargetedLocation(player, Location location = Methods.getTargetedLocation(player,
(int) Methods.firebendingDayAugment(range, player.getWorld())); (int) Methods.getFirebendingDayAugment(range, player.getWorld()));
for (Block block : Methods.getBlocksAroundPoint(location, for (Block block : Methods.getBlocksAroundPoint(location,
(int) Methods.firebendingDayAugment(radius, player.getWorld()))) { (int) Methods.getFirebendingDayAugment(radius, player.getWorld()))) {
if (Methods.isMeltable(block)) { if (Methods.isMeltable(block)) {
Melt.melt(player, block); Melt.melt(player, block);
} else if (isHeatable(block)) { } else if (isHeatable(block)) {

2
src/com/projectkorra/ProjectKorra/firebending/Illumination.java
View file

@ -71,7 +71,7 @@ public class Illumination {
} else if (player.getWorld() != block.getWorld()) { } else if (player.getWorld() != block.getWorld()) {
revert(); revert();
} else if (player.getLocation().distance(block.getLocation()) > Methods } else if (player.getLocation().distance(block.getLocation()) > Methods
.firebendingDayAugment(range, player.getWorld())) { .getFirebendingDayAugment(range, player.getWorld())) {
revert(); revert();
} }
} }

4
src/com/projectkorra/ProjectKorra/firebending/Lightning.java
View file

@ -63,7 +63,7 @@ public class Lightning {
} }
private Location getTargetLocation() { private Location getTargetLocation() {
int distance = (int) Methods.firebendingDayAugment(defaultdistance, int distance = (int) Methods.getFirebendingDayAugment(defaultdistance,
player.getWorld()); player.getWorld());
Location targetlocation; Location targetlocation;
@ -110,7 +110,7 @@ public class Lightning {
return; return;
} }
int distance = (int) Methods.firebendingDayAugment(defaultdistance, int distance = (int) Methods.getFirebendingDayAugment(defaultdistance,
player.getWorld()); player.getWorld());
long warmup = (int) ((double) defaultwarmup / ProjectKorra.plugin.getConfig().getDouble("Properties.Fire.DayFactor")); long warmup = (int) ((double) defaultwarmup / ProjectKorra.plugin.getConfig().getDouble("Properties.Fire.DayFactor"));
if (AvatarState.isAvatarState(player)) if (AvatarState.isAvatarState(player))

8
src/com/projectkorra/ProjectKorra/firebending/WallOfFire.java
View file

@ -64,11 +64,11 @@ public class WallOfFire {
World world = player.getWorld(); World world = player.getWorld();
if (Methods.isDay(player.getWorld())) { if (Methods.isDay(player.getWorld())) {
width = (int) Methods.firebendingDayAugment((double) width, world); width = (int) Methods.getFirebendingDayAugment((double) width, world);
height = (int) Methods.firebendingDayAugment((double) height, world); height = (int) Methods.getFirebendingDayAugment((double) height, world);
duration = (long) Methods.firebendingDayAugment((double) duration, duration = (long) Methods.getFirebendingDayAugment((double) duration,
world); world);
damage = (int) Methods.firebendingDayAugment((double) damage, world); damage = (int) Methods.getFirebendingDayAugment((double) damage, world);
} }
time = System.currentTimeMillis(); time = System.currentTimeMillis();