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

Simplification of the code

Browse source 
Instead of 3 if statements containing almost the same code, one switch statement and one small helper method.
This commit is contained in:
HiddenCloud 2014-08-01 22:50:53 +00:00
parent 65e0f0bd97
commit 1e45ff4fac
1 changed files with 17 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/com/projectkorra/ProjectKorra/earthbending/Extraction.java
View file

@ -35,56 +35,29 @@ public class Extraction {
}
if (!Methods.isRegionProtectedFromBuild(player, "Extraction", block.getLocation())) {
if (Methods.canMetalbend(player) && Methods.canBend(player.getName(), "Extraction")) {
Random rand = new Random();
if (rand.nextInt(99) + 1 <= triplechance) {
if (block.getType() == Material.IRON_ORE) {
switch(block.getType()) {
case IRON_ORE:
block.setType(Material.STONE);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.IRON_INGOT, 3));
}
if (block.getType() == Material.GOLD_ORE){
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.IRON_INGOT, getAmount());
break;
case GOLD_ORE:
block.setType(Material.STONE);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.GOLD_INGOT, 3));
}
if (block.getType() == Material.QUARTZ_ORE) {
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.GOLD_INGOT, getAmount());
break;
case QUARTZ_ORE:
block.setType(Material.NETHERRACK);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.QUARTZ, 3));
}
cooldowns.put(player.getName(), System.currentTimeMillis());
return;
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.QUARTZ, getAmount());
break;
case default:
break;//shouldn't happen
}
else if (rand.nextInt(99) + 1 <= doublechance) {
if (block.getType() == Material.IRON_ORE) {
block.setType(Material.STONE);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.IRON_INGOT, 2));
}
if (block.getType() == Material.GOLD_ORE){
block.setType(Material.STONE);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.GOLD_INGOT, 2));
}
if (block.getType() == Material.QUARTZ_ORE) {
block.setType(Material.NETHERRACK);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.QUARTZ, 2));
}
cooldowns.put(player.getName(), System.currentTimeMillis());
return;
} else {
if (block.getType() == Material.IRON_ORE) {
block.setType(Material.STONE);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.IRON_INGOT));
}
if (block.getType() == Material.GOLD_ORE){
block.setType(Material.STONE);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.GOLD_INGOT));
}
if (block.getType() == Material.QUARTZ_ORE) {
block.setType(Material.NETHERRACK);
player.getWorld().dropItem(player.getLocation(), new ItemStack(Material.QUARTZ));
}
cooldowns.put(player.getName(), System.currentTimeMillis());
return;
}
}
}
private int getAmount() {
Random rand = new Random();
return rand.nextInt(99) + 1 <= triplechance ? 3 : rand.nextInt(99) + 1 <= doublechance ? 2: 0;
}
}
}