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

BETA 4

Browse source 
Fixes Offline lookup command duplicate message
Tad more rebalance
This commit is contained in:
OmniCypher 2015-09-22 18:27:52 -07:00
parent 17006d1049
commit 5d96a4734e
3 changed files with 96 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
src/com/projectkorra/projectkorra/command/WhoCommand.java
View file

@ -54,7 +54,7 @@ public class WhoCommand extends PKCommand {
staff.put("623df34e-9cd4-438d-b07c-1905e1fc46b6", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Loony staff.put("623df34e-9cd4-438d-b07c-1905e1fc46b6", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Loony
staff.put("80f9072f-e37e-4adc-8675-1ba6af87d63b", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Cross staff.put("80f9072f-e37e-4adc-8675-1ba6af87d63b", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Cross
staff.put("ce889d32-c2a0-4765-969f-9ca54d0bd34a", ChatColor.GREEN + "ProjectKorra Concept Designer"); // ashe36 staff.put("57205eec-96bd-4aa3-b73f-c6627429beb2", ChatColor.GREEN + "ProjectKorra Concept Designer"); // ashe36
staff.put("7daead36-d285-4640-848a-2f105334b792", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Fuzzy staff.put("7daead36-d285-4640-848a-2f105334b792", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Fuzzy
staff.put("f30c871e-cd60-446b-b219-e31e00e16857", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Gangksta staff.put("f30c871e-cd60-446b-b219-e31e00e16857", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Gangksta
staff.put("38217173-8a32-4ba7-9fe1-dd4fed031a74", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Fly staff.put("38217173-8a32-4ba7-9fe1-dd4fed031a74", ChatColor.GREEN + "ProjectKorra Concept Designer"); // Fly
@ -117,8 +117,10 @@ public class WhoCommand extends PKCommand {
/** /**
* Sends information on the given player to the CommandSender. * Sends information on the given player to the CommandSender.
* *
* @param sender The CommandSender to display the information to * @param sender
* @param playerName The Player to look up * The CommandSender to display the information to
* @param playerName
* The Player to look up
*/ */
private void whoPlayer(final CommandSender sender, final String playerName) { private void whoPlayer(final CommandSender sender, final String playerName) {
//Player player = Bukkit.getPlayer(playerName); //Player player = Bukkit.getPlayer(playerName);
@ -131,8 +133,9 @@ public class WhoCommand extends PKCommand {
if (!player.isOnline() && !BendingPlayer.getPlayers().containsKey(player.getUniqueId())) { if (!player.isOnline() && !BendingPlayer.getPlayers().containsKey(player.getUniqueId())) {
sender.sendMessage(player.getName() + ChatColor.GRAY + " is currently offline. A lookup is currently being done (this might take a few seconds)."); sender.sendMessage(player.getName() + ChatColor.GRAY + " is currently offline. A lookup is currently being done (this might take a few seconds).");
} }
Player player_ = (Player) (player.isOnline() ? player : null); Player player_ = (Player) (player.isOnline() ? player : null);
sender.sendMessage(player.getName() + (!player.isOnline() ? ChatColor.RESET + " (Offline)" : "") + " - ");
if (!BendingPlayer.getPlayers().containsKey(player.getUniqueId())) { if (!BendingPlayer.getPlayers().containsKey(player.getUniqueId())) {
GeneralMethods.createBendingPlayer(player.getUniqueId(), playerName); GeneralMethods.createBendingPlayer(player.getUniqueId(), playerName);
BukkitRunnable runnable = new BukkitRunnable() { BukkitRunnable runnable = new BukkitRunnable() {
@ -148,7 +151,8 @@ public class WhoCommand extends PKCommand {
count++; count++;
try { try {
Thread.sleep(delay); Thread.sleep(delay);
} catch (InterruptedException e) { }
catch (InterruptedException e) {
e.printStackTrace(); e.printStackTrace();
sender.sendMessage(ChatColor.DARK_RED + "The database appears to busy at the moment. Please wait a few seconds and try again."); sender.sendMessage(ChatColor.DARK_RED + "The database appears to busy at the moment. Please wait a few seconds and try again.");
break; break;
@ -160,82 +164,85 @@ public class WhoCommand extends PKCommand {
runnable.runTaskAsynchronously(ProjectKorra.plugin); runnable.runTaskAsynchronously(ProjectKorra.plugin);
return; return;
} }
if (GeneralMethods.isBender(playerName, Element.Air)) { if (BendingPlayer.getPlayers().containsKey(player.getUniqueId())) {
sender.sendMessage(AirMethods.getAirColor() + "- Airbender"); sender.sendMessage(player.getName() + (!player.isOnline() ? ChatColor.RESET + " (Offline)" : "") + " - ");
if (player_ != null && AirMethods.canAirFlight((Player) player)) { if (GeneralMethods.isBender(playerName, Element.Air)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Air) + " Can Fly"); sender.sendMessage(AirMethods.getAirColor() + "- Airbender");
} if (player_ != null && AirMethods.canAirFlight((Player) player)) {
if (player_ != null && AirMethods.canUseSpiritualProjection((Player) player)) { sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Air) + " Can Fly");
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Air) + " Can use Spiritual Projection"); }
} if (player_ != null && AirMethods.canUseSpiritualProjection((Player) player)) {
} sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Air) + " Can use Spiritual Projection");
if (GeneralMethods.isBender(playerName, Element.Water)) {
sender.sendMessage(WaterMethods.getWaterColor() + "- Waterbender");
if (player_ != null && WaterMethods.canPlantbend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Plantbend");
}
if (player_ != null && WaterMethods.canBloodbend((Player) player)) {
if (WaterMethods.canBloodbendAtAnytime((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Bloodbend anytime, on any day");
} else {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Bloodbend");
} }
} }
if (player_ != null && WaterMethods.canIcebend((Player) player)) { if (GeneralMethods.isBender(playerName, Element.Water)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Icebend"); sender.sendMessage(WaterMethods.getWaterColor() + "- Waterbender");
} if (player_ != null && WaterMethods.canPlantbend((Player) player)) {
if (player_ != null && WaterMethods.canWaterHeal((Player) player)) { sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Plantbend");
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Heal"); }
} if (player_ != null && WaterMethods.canBloodbend((Player) player)) {
} if (WaterMethods.canBloodbendAtAnytime((Player) player)) {
if (GeneralMethods.isBender(playerName, Element.Earth)) { sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Bloodbend anytime, on any day");
sender.sendMessage(EarthMethods.getEarthColor() + "- Earthbender"); } else {
if (player_ != null && EarthMethods.canMetalbend((Player) player)) { sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Bloodbend");
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Earth) + " Can Metalbend"); }
} }
if (player_ != null && EarthMethods.canLavabend((Player) player)) { if (player_ != null && WaterMethods.canIcebend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Earth) + " Can Lavabend"); sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Icebend");
} }
if (player_ != null && EarthMethods.canSandbend((Player) player)) { if (player_ != null && WaterMethods.canWaterHeal((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Earth) + " Can Sandbend"); sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Water) + " Can Heal");
}
}
if (GeneralMethods.isBender(playerName, Element.Fire)) {
sender.sendMessage(FireMethods.getFireColor() + "- Firebender");
if (player_ != null && FireMethods.canCombustionbend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Fire) + " Can Combustionbend");
}
if (player_ != null && FireMethods.canLightningbend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Fire) + " Can Lightningbend");
}
}
if (GeneralMethods.isBender(playerName, Element.Chi)) {
sender.sendMessage(ChiMethods.getChiColor() + "- ChiBlocker");
}
BendingPlayer bPlayer = GeneralMethods.getBendingPlayer(playerName);
UUID uuid = player.getUniqueId();
if (bPlayer != null) {
sender.sendMessage("Abilities: ");
for (int i = 1; i <= 9; i++) {
String ability = bPlayer.getAbilities().get(i);
if (ability == null || ability.equalsIgnoreCase("null")) {
continue;
} else {
sender.sendMessage(i + " - " + GeneralMethods.getAbilityColor(ability) + ability);
} }
} }
} if (GeneralMethods.isBender(playerName, Element.Earth)) {
sender.sendMessage(EarthMethods.getEarthColor() + "- Earthbender");
if (GeneralMethods.hasRPG()) { if (player_ != null && EarthMethods.canMetalbend((Player) player)) {
if (RPGMethods.isCurrentAvatar(player.getUniqueId())) { sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Earth) + " Can Metalbend");
sender.sendMessage(GeneralMethods.getAvatarColor() + "Current Avatar"); }
} else if (RPGMethods.hasBeenAvatar(player.getUniqueId())) { if (player_ != null && EarthMethods.canLavabend((Player) player)) {
sender.sendMessage(GeneralMethods.getAvatarColor() + "Former Avatar"); sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Earth) + " Can Lavabend");
}
if (player_ != null && EarthMethods.canSandbend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Earth) + " Can Sandbend");
}
}
if (GeneralMethods.isBender(playerName, Element.Fire)) {
sender.sendMessage(FireMethods.getFireColor() + "- Firebender");
if (player_ != null && FireMethods.canCombustionbend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Fire) + " Can Combustionbend");
}
if (player_ != null && FireMethods.canLightningbend((Player) player)) {
sender.sendMessage(GeneralMethods.getSubBendingColor(Element.Fire) + " Can Lightningbend");
}
}
if (GeneralMethods.isBender(playerName, Element.Chi)) {
sender.sendMessage(ChiMethods.getChiColor() + "- ChiBlocker");
}
BendingPlayer bPlayer = GeneralMethods.getBendingPlayer(playerName);
UUID uuid = player.getUniqueId();
if (bPlayer != null) {
sender.sendMessage("Abilities: ");
for (int i = 1; i <= 9; i++) {
String ability = bPlayer.getAbilities().get(i);
if (ability == null || ability.equalsIgnoreCase("null")) {
continue;
} else {
sender.sendMessage(i + " - " + GeneralMethods.getAbilityColor(ability) + ability);
}
}
} }
}
if (staff.containsKey(uuid.toString())) { if (GeneralMethods.hasRPG()) {
sender.sendMessage(staff.get(uuid.toString())); if (RPGMethods.isCurrentAvatar(player.getUniqueId())) {
sender.sendMessage(GeneralMethods.getAvatarColor() + "Current Avatar");
} else if (RPGMethods.hasBeenAvatar(player.getUniqueId())) {
sender.sendMessage(GeneralMethods.getAvatarColor() + "Former Avatar");
}
}
if (staff.containsKey(uuid.toString())) {
sender.sendMessage(staff.get(uuid.toString()));
}
} }
} }
} }

26
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -121,7 +121,7 @@ public class ConfigManager {
config.addDefault("Properties.HorizontalCollisionPhysics.Enabled", true); config.addDefault("Properties.HorizontalCollisionPhysics.Enabled", true);
config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageMinimumDistance", 5.0); config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageMinimumDistance", 5.0);
config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageCap", 4.0); config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageCap", 6.0);
config.addDefault("Properties.CustomItems.GrapplingHook.Enable", true); config.addDefault("Properties.CustomItems.GrapplingHook.Enable", true);
config.addDefault("Properties.CustomItems.GrapplingHook.IronUses", 25); config.addDefault("Properties.CustomItems.GrapplingHook.IronUses", 25);
@ -160,7 +160,7 @@ public class ConfigManager {
config.addDefault("Properties.Earth.PlaySound", true); config.addDefault("Properties.Earth.PlaySound", true);
config.addDefault("Properties.Fire.CanBendWithWeapons", true); config.addDefault("Properties.Fire.CanBendWithWeapons", true);
config.addDefault("Properties.Fire.DayFactor", 1.0); config.addDefault("Properties.Fire.DayFactor", 1.25);
config.addDefault("Properties.Fire.PlaySound", true); config.addDefault("Properties.Fire.PlaySound", true);
config.addDefault("Properties.Fire.NightMessage", "You feel the empowering of your firebending subside as the sun sets."); config.addDefault("Properties.Fire.NightMessage", "You feel the empowering of your firebending subside as the sun sets.");
config.addDefault("Properties.Fire.DayMessage", "You feel the strength of the rising sun empowering your firebending."); config.addDefault("Properties.Fire.DayMessage", "You feel the strength of the rising sun empowering your firebending.");
@ -195,7 +195,7 @@ public class ConfigManager {
config.addDefault("Abilities.Air.AirBlast.Enabled", true); config.addDefault("Abilities.Air.AirBlast.Enabled", true);
config.addDefault("Abilities.Air.AirBlast.Description", "AirBlast is the most fundamental bending technique of an airbender." + " To use, simply left-click in a direction. A gust of wind will be" + " created at your fingertips, launching anything in its path harmlessly back." + " A gust of air can extinguish fires on the ground or on a player, can cool lava, and " + "can flip levers and activate buttons. Additionally, tapping sneak will change the " + "origin of your next AirBlast to your targeted location."); config.addDefault("Abilities.Air.AirBlast.Description", "AirBlast is the most fundamental bending technique of an airbender." + " To use, simply left-click in a direction. A gust of wind will be" + " created at your fingertips, launching anything in its path harmlessly back." + " A gust of air can extinguish fires on the ground or on a player, can cool lava, and " + "can flip levers and activate buttons. Additionally, tapping sneak will change the " + "origin of your next AirBlast to your targeted location.");
config.addDefault("Abilities.Air.AirBlast.Speed", 20); config.addDefault("Abilities.Air.AirBlast.Speed", 25);
config.addDefault("Abilities.Air.AirBlast.Range", 20); config.addDefault("Abilities.Air.AirBlast.Range", 20);
config.addDefault("Abilities.Air.AirBlast.Radius", 2); config.addDefault("Abilities.Air.AirBlast.Radius", 2);
config.addDefault("Abilities.Air.AirBlast.Push", 2.5); config.addDefault("Abilities.Air.AirBlast.Push", 2.5);
@ -233,7 +233,7 @@ public class ConfigManager {
config.addDefault("Abilities.Air.AirSuction.Enabled", true); config.addDefault("Abilities.Air.AirSuction.Enabled", true);
config.addDefault("Abilities.Air.AirSuction.Description", "To use, simply left-click in a direction. A gust of wind will originate as far as it can in that direction and flow towards you, sucking anything in its path harmlessly with it. Skilled benders can use this technique to pull items from precarious locations. Additionally, tapping sneak will change the origin of your next AirSuction to your targeted location."); config.addDefault("Abilities.Air.AirSuction.Description", "To use, simply left-click in a direction. A gust of wind will originate as far as it can in that direction and flow towards you, sucking anything in its path harmlessly with it. Skilled benders can use this technique to pull items from precarious locations. Additionally, tapping sneak will change the origin of your next AirSuction to your targeted location.");
config.addDefault("Abilities.Air.AirSuction.Speed", 20); config.addDefault("Abilities.Air.AirSuction.Speed", 25);
config.addDefault("Abilities.Air.AirSuction.Range", 20); config.addDefault("Abilities.Air.AirSuction.Range", 20);
config.addDefault("Abilities.Air.AirSuction.Radius", 2); config.addDefault("Abilities.Air.AirSuction.Radius", 2);
config.addDefault("Abilities.Air.AirSuction.Push", 2.5); config.addDefault("Abilities.Air.AirSuction.Push", 2.5);
@ -396,16 +396,16 @@ public class ConfigManager {
config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldownEnabled", false); config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldownEnabled", false);
config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown", 200); config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown", 200);
config.addDefault("Abilities.Water.WaterArms.Whip.MaxLength", 16); config.addDefault("Abilities.Water.WaterArms.Whip.MaxLength", 12);
config.addDefault("Abilities.Water.WaterArms.Whip.MaxLengthWeak", 12); config.addDefault("Abilities.Water.WaterArms.Whip.MaxLengthWeak", 8);
config.addDefault("Abilities.Water.WaterArms.Whip.NightAugments.MaxLength.Normal", 20); config.addDefault("Abilities.Water.WaterArms.Whip.NightAugments.MaxLength.Normal", 16);
config.addDefault("Abilities.Water.WaterArms.Whip.NightAugments.MaxLength.FullMoon", 24); config.addDefault("Abilities.Water.WaterArms.Whip.NightAugments.MaxLength.FullMoon", 20);
config.addDefault("Abilities.Water.WaterArms.Whip.Pull.Multiplier", 0.15); config.addDefault("Abilities.Water.WaterArms.Whip.Pull.Multiplier", 0.15);
config.addDefault("Abilities.Water.WaterArms.Whip.Punch.PunchDamage", 0.5); config.addDefault("Abilities.Water.WaterArms.Whip.Punch.PunchDamage", 0.5);
config.addDefault("Abilities.Water.WaterArms.Whip.Punch.MaxLength", 10); config.addDefault("Abilities.Water.WaterArms.Whip.Punch.MaxLength", 6);
config.addDefault("Abilities.Water.WaterArms.Whip.Punch.NightAugments.MaxLength.Normal", 11); config.addDefault("Abilities.Water.WaterArms.Whip.Punch.NightAugments.MaxLength.Normal", 11);
config.addDefault("Abilities.Water.WaterArms.Whip.Punch.NightAugments.MaxLength.FullMoon", 13); config.addDefault("Abilities.Water.WaterArms.Whip.Punch.NightAugments.MaxLength.FullMoon", 13);
@ -616,7 +616,7 @@ public class ConfigManager {
// config.addDefault("Abilities.Fire.Combustion.ChargeTime", 5000); // config.addDefault("Abilities.Fire.Combustion.ChargeTime", 5000);
config.addDefault("Abilities.Fire.Combustion.BreakBlocks", false); config.addDefault("Abilities.Fire.Combustion.BreakBlocks", false);
config.addDefault("Abilities.Fire.Combustion.Power", 1.0); config.addDefault("Abilities.Fire.Combustion.Power", 1.0);
config.addDefault("Abilities.Fire.Combustion.Damage", 4); config.addDefault("Abilities.Fire.Combustion.Damage", 5);
config.addDefault("Abilities.Fire.Combustion.Radius", 4); config.addDefault("Abilities.Fire.Combustion.Radius", 4);
config.addDefault("Abilities.Fire.Combustion.Range", 35); config.addDefault("Abilities.Fire.Combustion.Range", 35);
config.addDefault("Abilities.Fire.Combustion.Speed", 25); config.addDefault("Abilities.Fire.Combustion.Speed", 25);
@ -677,12 +677,12 @@ public class ConfigManager {
config.addDefault("Abilities.Fire.Lightning.Description", "Hold sneak while selecting this ability to charge up a lightning strike. Once charged, release sneak to discharge the lightning to the targeted location."); config.addDefault("Abilities.Fire.Lightning.Description", "Hold sneak while selecting this ability to charge up a lightning strike. Once charged, release sneak to discharge the lightning to the targeted location.");
config.addDefault("Abilities.Fire.Lightning.Damage", 6.0); config.addDefault("Abilities.Fire.Lightning.Damage", 6.0);
config.addDefault("Abilities.Fire.Lightning.Range", 20.0); config.addDefault("Abilities.Fire.Lightning.Range", 20.0);
config.addDefault("Abilities.Fire.Lightning.ChargeTime", 4000); config.addDefault("Abilities.Fire.Lightning.ChargeTime", 2500);
config.addDefault("Abilities.Fire.Lightning.Cooldown", 500); config.addDefault("Abilities.Fire.Lightning.Cooldown", 500);
config.addDefault("Abilities.Fire.Lightning.StunChance", 0.20); config.addDefault("Abilities.Fire.Lightning.StunChance", 0.20);
config.addDefault("Abilities.Fire.Lightning.StunDuration", 30.0); config.addDefault("Abilities.Fire.Lightning.StunDuration", 30.0);
config.addDefault("Abilities.Fire.Lightning.MaxArcAngle", 10); config.addDefault("Abilities.Fire.Lightning.MaxArcAngle", 5);
config.addDefault("Abilities.Fire.Lightning.SubArcChance", 0.025); config.addDefault("Abilities.Fire.Lightning.SubArcChance", 0.00125);
config.addDefault("Abilities.Fire.Lightning.ChainArcRange", 6.0); config.addDefault("Abilities.Fire.Lightning.ChainArcRange", 6.0);
config.addDefault("Abilities.Fire.Lightning.ChainArcChance", 0.50); config.addDefault("Abilities.Fire.Lightning.ChainArcChance", 0.50);
config.addDefault("Abilities.Fire.Lightning.MaxChainArcs", 2); config.addDefault("Abilities.Fire.Lightning.MaxChainArcs", 2);

2
src/plugin.yml
View file

@ -1,6 +1,6 @@
name: ProjectKorra name: ProjectKorra
author: ProjectKorra author: ProjectKorra
version: 1.8.0 BETA 3 version: 1.8.0 BETA 4
main: com.projectkorra.projectkorra.ProjectKorra main: com.projectkorra.projectkorra.ProjectKorra
softdepend: [PreciousStones, WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention, Towny, NoCheatPlus, LWC] softdepend: [PreciousStones, WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention, Towny, NoCheatPlus, LWC]
commands: commands: