From a61423aa990a029afc83ab7beeda5490b223f1a7 Mon Sep 17 00:00:00 2001
From: Glitchfinder <glitchkey@gmail.com>
Date: Tue, 13 Nov 2012 14:27:58 -0800
Subject: [PATCH] Dealing with a few minor issues.

---
 .../com/gmail/nossr50/commands/skills/FishingCommand.java   | 6 +++++-
 .../java/com/gmail/nossr50/runnables/ChunkletUnloader.java  | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
index e7f095d6c..b324d0ad4 100644
--- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -25,7 +25,11 @@ public class FishingCommand extends SkillCommand {
     protected void dataCalculations() {
         lootTier = Fishing.getFishingLootTier(profile);
         magicChance = percent.format((float) lootTier / 15);
-        shakeChance = String.valueOf(Fishing.getShakeChance(lootTier));
+        int dropChance = Fishing.getShakeChance(lootTier);
+        if (player.hasPermission("mcmmo.perks.lucky.fishing")) {
+            dropChance = (int) (dropChance * 1.25);
+        }
+        shakeChance = String.valueOf(dropChance);
 
         if (skillValue >= 1000) {
             fishermansDietRank = "5";
diff --git a/src/main/java/com/gmail/nossr50/runnables/ChunkletUnloader.java b/src/main/java/com/gmail/nossr50/runnables/ChunkletUnloader.java
index de7e33d8f..8460d9ce1 100644
--- a/src/main/java/com/gmail/nossr50/runnables/ChunkletUnloader.java
+++ b/src/main/java/com/gmail/nossr50/runnables/ChunkletUnloader.java
@@ -42,7 +42,10 @@ public class ChunkletUnloader implements Runnable {
 
                 //Chunklets are unloaded only if their chunk has been unloaded for minimumInactiveTime
                 if (inactiveTime >= minimumInactiveTime) {
-                    mcMMO.placeStore.unloadChunk(chunk.getX(), chunk.getZ(), chunk.getWorld());
+                    if(mcMMO.p.placeStore == null)
+                        continue;
+
+                    mcMMO.p.placeStore.unloadChunk(chunk.getX(), chunk.getZ(), chunk.getWorld());
                     it.remove();
                     continue;
                 }