EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-28 03:34:43 +02:00
Code Issues Projects Releases Wiki Activity

Merging TfT_02's branch in.

Browse Source
This commit is contained in:
Glitchfinder
2013-01-08 17:28:09 -08:00
parent 003c89c3a4 3904b172ad
commit 46bf22e36b
35 changed files with 381 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/skills/combat/Axes.java
View File

@ -96,7 +96,6 @@ public class Axes {
}
if (chance > random.nextInt(randomChance) && !entity.isDead()){
// if (random.nextInt(randomChance) <= skillCheck && !entity.isDead()){
int damage = event.getDamage();
if (entity instanceof Player){

54
src/main/java/com/gmail/nossr50/skills/gathering/Fishing.java
View File

@ -108,11 +108,11 @@ public class Fishing {
default:
break;
}
if (Config.getInstance().getFishingDropsEnabled() && rewards.size() > 0
&& Permissions.fishingTreasures(player)) {
FishingTreasure treasure = rewards.get(random.nextInt(rewards
.size()));
FishingTreasure treasure;
treasure = rewards.get(random.nextInt(rewards.size()));
int randomChance = 100;
@ -121,26 +121,20 @@ public class Fishing {
}
if (random.nextDouble() * randomChance <= treasure.getDropChance()) {
Users.getPlayer(player).addXP(SkillType.FISHING,
treasure.getXp());
Users.getPlayer(player).addXP(SkillType.FISHING,treasure.getXp());
theCatch.setItemStack(treasure.getDrop());
}
} else {
theCatch.setItemStack(new ItemStack(Material.RAW_FISH));
}
short maxDurability = theCatch.getItemStack().getType()
.getMaxDurability();
short maxDurability = theCatch.getItemStack().getType().getMaxDurability();
if (maxDurability > 0) {
theCatch.getItemStack().setDurability(
(short) (random.nextInt(maxDurability))); // Change
// durability to
// random value
theCatch.getItemStack().setDurability((short) (random.nextInt(maxDurability))); // Change durability to random value
}
Skills.xpProcessing(player, profile, SkillType.FISHING, Config
.getInstance().getFishingBaseXP());
Skills.xpProcessing(player, profile, SkillType.FISHING, Config.getInstance().getFishingBaseXP());
}
/**
@ -160,8 +154,7 @@ public class Fishing {
Item theCatch = (Item) event.getCaught();
if (theCatch.getItemStack().getType() != Material.RAW_FISH) {
final int ENCHANTMENT_CHANCE = advancedConfig
.getFishingEnchantmentChance();
final int ENCHANTMENT_CHANCE = advancedConfig.getFishingEnchantmentChance();
boolean enchanted = false;
ItemStack fishingResults = theCatch.getItemStack();
@ -173,16 +166,14 @@ public class Fishing {
if (Permissions.luckyFishing(player)) {
randomChance = (int) (randomChance * 0.75);
}
if (random.nextInt(randomChance) <= ENCHANTMENT_CHANCE
&& Permissions.fishingMagic(player)) {
&& Permissions.fishingMagic(player)) {
for (Enchantment newEnchant : Enchantment.values()) {
if (newEnchant.canEnchantItem(fishingResults)) {
Map<Enchantment, Integer> resultEnchantments = fishingResults
.getEnchantments();
Map<Enchantment, Integer> resultEnchantments = fishingResults.getEnchantments();
for (Enchantment oldEnchant : resultEnchantments
.keySet()) {
for (Enchantment oldEnchant : resultEnchantments.keySet()) {
if (oldEnchant.conflictsWith(newEnchant))
continue;
}
@ -191,23 +182,18 @@ public class Fishing {
* Actual chance to have an enchantment is related
* to your fishing skill
*/
if (random.nextInt(15) < Fishing
.getFishingLootTier(profile)) {
if (random.nextInt(15) < Fishing.getFishingLootTier(profile)) {
enchanted = true;
int randomEnchantLevel = random
.nextInt(newEnchant.getMaxLevel()) + 1;
int randomEnchantLevel = random.nextInt(newEnchant.getMaxLevel()) + 1;
if (randomEnchantLevel < newEnchant
.getStartLevel()) {
randomEnchantLevel = newEnchant
.getStartLevel();
if (randomEnchantLevel < newEnchant.getStartLevel()) {
randomEnchantLevel = newEnchant.getStartLevel();
}
if (randomEnchantLevel >= 1000)
continue;
fishingResults.addEnchantment(newEnchant,
randomEnchantLevel);
fishingResults.addEnchantment(newEnchant,randomEnchantLevel);
}
}
}
@ -238,10 +224,10 @@ public class Fishing {
int lootTier = getFishingLootTier(profile);
int dropChance = getShakeChance(lootTier);
if (Permissions.luckyFishing(player)) {
dropChance = (int) (dropChance * 1.25); // With lucky perk on max
// level tier, its 100%
// With lucky perk on max level tier, its 100%
dropChance = (int) (dropChance * 1.25);
}
final int DROP_CHANCE = random.nextInt(100);