EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 23:26:45 +01:00
Code Issues Projects Releases Wiki Activity

Minor cleanup of new party stuff.

Browse Source
This commit is contained in:
GJ 2013-01-30 11:25:44 -05:00
parent 637442149c
commit 62a037a4fd
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/gmail/nossr50/party/ShareHandler.java
View File

@ -21,17 +21,21 @@ public class ShareHandler {
RANDOM, RANDOM,
EQUAL, 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; int newExp = oldExp;
if (party.getExpShareMode() == null) { if (party.getExpShareMode() == null) {
party.setExpShareMode("NO_SHARE"); party.setExpShareMode("NO_SHARE");
} }
if (party.getExpShareMode().equals("NO_SHARE")) { if (party.getExpShareMode().equals("NO_SHARE")) {
return newExp; 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; return newExp;
} }
@ -41,13 +45,14 @@ public class ShareHandler {
* @param int XP without party sharing * @param int XP without party sharing
* @return the party shared XP * @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; int newExp = oldExp;
List<Player> nearMembers = PartyManager.getNearMembers(player, party, partyShareRange); List<Player> nearMembers = PartyManager.getNearMembers(player, party, partyShareRange);
if (nearMembers.size() > 0) { if (nearMembers.size() > 0) {
newExp = (int) ((oldExp / (nearMembers.size() + 1)) * partyShareBonus); newExp = (int) ((oldExp / (nearMembers.size() + 1)) * partyShareBonus);
} }
return newExp; return newExp;
} }

2
src/main/java/com/gmail/nossr50/skills/SkillTools.java
View File

@ -525,7 +525,7 @@ public class SkillTools {
} }
if (profile.inParty()) { 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); ShareHandler.handleEqualExpShare(xp, player, profile.getParty(), type);
} }