From 62a037a4fd3844a79e90da2be07f7e1f53a38a6b Mon Sep 17 00:00:00 2001
From: GJ <gjmcferrin@gmail.com>
Date: Wed, 30 Jan 2013 11:25:44 -0500
Subject: [PATCH] Minor cleanup of new party stuff.

---
 .../com/gmail/nossr50/party/ShareHandler.java     | 15 ++++++++++-----
 .../java/com/gmail/nossr50/skills/SkillTools.java |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/src/main/java/com/gmail/nossr50/party/ShareHandler.java
index 03ef27a93..2cfd969ac 100644
--- a/src/main/java/com/gmail/nossr50/party/ShareHandler.java
+++ b/src/main/java/com/gmail/nossr50/party/ShareHandler.java
@@ -21,17 +21,21 @@ public class ShareHandler {
         RANDOM,
         EQUAL,
     };
-    
-    public static double checkXpSharing(int oldExp, Player player, Party party, SkillType type) {
+
+    public static double checkXpSharing(int oldExp, Player player, Party party) {
         int newExp = oldExp;
+
         if (party.getExpShareMode() == null) {
             party.setExpShareMode("NO_SHARE");
         }
+
         if (party.getExpShareMode().equals("NO_SHARE")) {
             return newExp;
-        } else if (party.getExpShareMode().equals("EQUAL")) {
-            newExp = (int) calculateSharedExp(oldExp, player, party, type);
         }
+        else if (party.getExpShareMode().equals("EQUAL")) {
+            newExp = (int) calculateSharedExp(oldExp, player, party);
+        }
+
         return newExp;
     }
 
@@ -41,13 +45,14 @@ public class ShareHandler {
      * @param int XP without party sharing
      * @return the party shared XP
      */
-    public static double calculateSharedExp(int oldExp, Player player, Party party, SkillType type) {
+    public static double calculateSharedExp(int oldExp, Player player, Party party) {
         int newExp = oldExp;
         List<Player> nearMembers = PartyManager.getNearMembers(player, party, partyShareRange);
 
         if (nearMembers.size() > 0) {
             newExp = (int) ((oldExp / (nearMembers.size() + 1)) * partyShareBonus);
         }
+
         return newExp;
     }
 
diff --git a/src/main/java/com/gmail/nossr50/skills/SkillTools.java b/src/main/java/com/gmail/nossr50/skills/SkillTools.java
index 2c8fb0dfc..58d68453a 100644
--- a/src/main/java/com/gmail/nossr50/skills/SkillTools.java
+++ b/src/main/java/com/gmail/nossr50/skills/SkillTools.java
@@ -525,7 +525,7 @@ public class SkillTools {
         }
 
         if (profile.inParty()) {
-            xp = (int) ShareHandler.checkXpSharing(xp, player, profile.getParty(), type);
+            xp = (int) ShareHandler.checkXpSharing(xp, player, profile.getParty());
             ShareHandler.handleEqualExpShare(xp, player, profile.getParty(), type);
         }