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

Merge pull request #10 from jacklin213/master

Browse source 
Methods class documentation (jacklin213)
This commit is contained in:
MistPhizzle 2014-07-29 08:29:35 -04:00
commit 7e3b8ceb21
13 changed files with 1251 additions and 1109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.classpath
View file

@ -2,14 +2,18 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/LocalServer/BukkitForPlugins.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Factions.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/GriefPrevention.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/mcore.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/PreciousStones.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/TagAPI.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/Towny.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldEdit.jar"/>
<classpathentry kind="lib" path="C:/Users/Shawn/Documents/Bending Plugins/WorldGuard.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/ProjectKorra/Factions.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/ProjectKorra/GriefPrevention-282.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/ProjectKorra/mcore 7.2.1.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/ProjectKorra/PreciousStones.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/ProjectKorra/TagAPI.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/ProjectKorra/Towny.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/bukkit-1.7.9-R0.2.jar">
<attributes>
<attribute name="javadoc_location" value="http://jd.bukkit.org/dev/apidocs"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/WorldEdit-5.9.jar"/>
<classpathentry kind="lib" path="E:/Jack/Game dev/bukkit lib/WorldGuard-5.9.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

5
src/com/projectkorra/ProjectKorra/Commands.java
View file

@ -464,10 +464,6 @@ public class Commands {
BendingPlayer bPlayer = Methods.getBendingPlayer(s.getName());
if (isToggledForAll) {
s.sendMessage(ChatColor.DARK_RED + "Bending has been toggled off for all players. You may not use this command until after it is turned back on.");
return true;
}
if (bPlayer.isToggled) {
s.sendMessage(ChatColor.RED + "Your bending has been toggled off. You will not be able to use most abilities until you toggle it back.");
bPlayer.isToggled = false;
@ -498,6 +494,7 @@ public class Commands {
}
} else {
s.sendMessage(ChatColor.GOLD + "Proper Usage: /bending toggle <all>");
return true;
}
}
if (Arrays.asList(whoaliases).contains(args[0].toLowerCase())) {

2295
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();
int arc = (int) Methods.firebendingDayAugment(defaultarc,
int arc = (int) Methods.getFirebendingDayAugment(defaultarc,
player.getWorld());
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))) {
new HeatMelt(player);
return;
}
double radius = Methods.firebendingDayAugment(defaultradius, player.getWorld());
double radius = Methods.getFirebendingDayAugment(defaultradius, player.getWorld());
for (Block block : Methods.getBlocksAroundPoint(
player.getTargetBlock(null, (int) range).getLocation(), radius)) {
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)) {
return;
}
range = Methods.firebendingDayAugment(range, player.getWorld());
range = Methods.getFirebendingDayAugment(range, player.getWorld());
// timers.put(player, System.currentTimeMillis());
this.player = player;
location = player.getEyeLocation();
@ -95,7 +95,7 @@ public class FireBlast {
return;
}
safe = safeblocks;
range = Methods.firebendingDayAugment(range, player.getWorld());
range = Methods.getFirebendingDayAugment(range, player.getWorld());
// timers.put(player, System.currentTimeMillis());
this.player = player;
this.location = location.clone();
@ -219,7 +219,7 @@ public class FireBlast {
}
if (entity instanceof LivingEntity) {
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);
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();
if (FireStream.isIgnitable(player, block) || block.getType() == Material.AIR || AvatarState.isAvatarState(player)) {
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;
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;
origin = location.clone();
this.location = origin.clone();

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

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

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

@ -16,9 +16,9 @@ public class HeatMelt {
public HeatMelt(Player player) {
Location location = Methods.getTargetedLocation(player,
(int) Methods.firebendingDayAugment(range, player.getWorld()));
(int) Methods.getFirebendingDayAugment(range, player.getWorld()));
for (Block block : Methods.getBlocksAroundPoint(location,
(int) Methods.firebendingDayAugment(radius, player.getWorld()))) {
(int) Methods.getFirebendingDayAugment(radius, player.getWorld()))) {
if (Methods.isMeltable(block)) {
Melt.melt(player, 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()) {
revert();
} else if (player.getLocation().distance(block.getLocation()) > Methods
.firebendingDayAugment(range, player.getWorld())) {
.getFirebendingDayAugment(range, player.getWorld())) {
revert();
}
}

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

@ -63,7 +63,7 @@ public class Lightning {
}
private Location getTargetLocation() {
int distance = (int) Methods.firebendingDayAugment(defaultdistance,
int distance = (int) Methods.getFirebendingDayAugment(defaultdistance,
player.getWorld());
Location targetlocation;
@ -110,7 +110,7 @@ public class Lightning {
return;
}
int distance = (int) Methods.firebendingDayAugment(defaultdistance,
int distance = (int) Methods.getFirebendingDayAugment(defaultdistance,
player.getWorld());
long warmup = (int) ((double) defaultwarmup / ProjectKorra.plugin.getConfig().getDouble("Properties.Fire.DayFactor"));
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();
if (Methods.isDay(player.getWorld())) {
width = (int) Methods.firebendingDayAugment((double) width, world);
height = (int) Methods.firebendingDayAugment((double) height, world);
duration = (long) Methods.firebendingDayAugment((double) duration,
width = (int) Methods.getFirebendingDayAugment((double) width, world);
height = (int) Methods.getFirebendingDayAugment((double) height, world);
duration = (long) Methods.getFirebendingDayAugment((double) duration,
world);
damage = (int) Methods.firebendingDayAugment((double) damage, world);
damage = (int) Methods.getFirebendingDayAugment((double) damage, world);
}
time = System.currentTimeMillis();