projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source
This commit is contained in:
Seefo
2014-04-02 14:12:12 -04:00
parent ec74046a7d 4c5ff93385
commit ee60625298
21 changed files with 322 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/PlayerService.java
+6 -4
View File
@@ -64,6 +64,7 @@ import resources.common.RGB;
import resources.common.SpawnPoint;
import resources.common.StringUtilities;
import resources.datatables.PlayerFlags;
import resources.datatables.Professions;
import resources.guild.Guild;
import resources.objects.Buff;
import resources.objects.building.BuildingObject;
@@ -533,8 +534,8 @@ public class PlayerService implements INetworkDispatch {
}
player.setProfession(profession);
String xpType = ((player.getProfession().contains("entertainer")) ? "entertainer" : ((player.getProfession().contains("trader")) ? "crafting" : "combat_general"));
String xpType = ((profession.contains("entertainer")) ? "entertainer" : ((profession.contains("trader")) ? "crafting" : "combat_general"));
int experience = player.getXp(xpType);
@@ -544,7 +545,7 @@ public class PlayerService implements INetworkDispatch {
for (int i = 0; i < experienceTable.getRowCount(); i++) {
if (experienceTable.getObject(i, 0) != null) {
if (experience >= ((Integer) experienceTable.getObject(i, 1))) {
level = (Integer) experienceTable.getObject(i, 1);
level = (Integer) experienceTable.getObject(i, 0);
}
}
}
@@ -553,6 +554,7 @@ public class PlayerService implements INetworkDispatch {
}
grantLevel(creature, level);
player.setProfessionIcon(Professions.get(profession));
}
/*
@@ -598,7 +600,7 @@ public class PlayerService implements INetworkDispatch {
for (String skill : creature.getSkills()) {
core.skillService.removeSkill(creature, skill);
}
String xpType = ((player.getProfession().contains("entertainer")) ? "entertainer" : ((player.getProfession().contains("trader")) ? "crafting" : "combat_general"));
player.setXp(xpType, 0);