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

Start cleaning up the mess we've made of our listeners.

Browse Source
This commit is contained in:
GJ
2013-01-24 11:45:40 -05:00
parent 29d796b6af
commit ab677e941d
4 changed files with 183 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java
View File

@ -7,6 +7,7 @@ import org.bukkit.DyeColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
@ -139,16 +140,12 @@ public class Fishing {
*/
public static void processResults(PlayerFishEvent event) {
Player player = event.getPlayer();
if (player == null)
return;
PlayerProfile profile = Users.getProfile(player);
getFishingResults(player, event);
Item theCatch = (Item) event.getCaught();
if (theCatch.getItemStack().getType() != Material.RAW_FISH) {
int lootTier = Fishing.getFishingLootTier(profile);
int lootTier = Fishing.getFishingLootTier(Users.getProfile(player));
int specificChance = 1;
boolean enchanted = false;
ItemStack fishingResults = theCatch.getItemStack();
@ -224,6 +221,18 @@ public class Fishing {
* The event to modify
*/
public static void shakeMob(PlayerFishEvent event) {
Entity caughtEntity = event.getCaught();
if (!(caughtEntity instanceof LivingEntity)) {
return;
}
Player player = event.getPlayer();
if (Users.getProfile(player).getSkillLevel(SkillType.FISHING) < Fishing.shakeUnlockLevel || !Permissions.shakeMob(player)) {
return;
}
int randomChance = 100;
//TODO: Invert this so it matches the rest of our lucky checks...
@ -231,7 +240,7 @@ public class Fishing {
randomChance = 125;
}
final Player player = event.getPlayer();
final PlayerProfile profile = Users.getProfile(player);
int lootTier = getFishingLootTier(profile);