projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-27 12:12:51 -04:00
Code Issues Projects Releases Wiki Activity

Fixed remove skill mod error, some equipment stuff aswell

Browse Source
This commit is contained in:
Seefo
2014-04-03 13:42:53 -04:00
parent f3f57b5d75
commit f6c03c19aa
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/creature/CreatureObject.java
+1 -1
View File
@@ -605,7 +605,7 @@ public class CreatureObject extends TangibleObject implements IPersistent {
public void removeSkillMod(SkillMod mod) {
if (mod != null) {
skillMods.remove(mod.getName());
skillMods.remove(mod);
}
}
src/services/EquipmentService.java
+12 -12
View File
@@ -332,21 +332,21 @@ public class EquipmentService implements INetworkDispatch {
// Need to refactor below
private void addForceProtection(CreatureObject actor, SWGObject item) {
actor.addSkillMod("kinetic", getForceProtection(item));
actor.addSkillMod("energy", getForceProtection(item));
actor.addSkillMod("heat", getForceProtection(item));
actor.addSkillMod("cold", getForceProtection(item));
actor.addSkillMod("acid", getForceProtection(item));
actor.addSkillMod("electricity", getForceProtection(item));
core.skillModService.addSkillMod(actor, "kinetic", getForceProtection(item));
core.skillModService.addSkillMod(actor, "energy", getForceProtection(item));
core.skillModService.addSkillMod(actor, "heat", getForceProtection(item));
core.skillModService.addSkillMod(actor, "cold", getForceProtection(item));
core.skillModService.addSkillMod(actor, "acid", getForceProtection(item));
core.skillModService.addSkillMod(actor, "electricity", getForceProtection(item));
}
private void deductForceProtection(CreatureObject actor, SWGObject item) {
actor.deductSkillMod("kinetic", getForceProtection(item));
actor.deductSkillMod("energy", getForceProtection(item));
actor.deductSkillMod("heat", getForceProtection(item));
actor.deductSkillMod("cold", getForceProtection(item));
actor.deductSkillMod("acid", getForceProtection(item));
actor.deductSkillMod("electricity", getForceProtection(item));
core.skillModService.deductSkillMod(actor, "kinetic", getForceProtection(item));
core.skillModService.deductSkillMod(actor, "energy", getForceProtection(item));
core.skillModService.deductSkillMod(actor, "heat", getForceProtection(item));
core.skillModService.deductSkillMod(actor, "cold", getForceProtection(item));
core.skillModService.deductSkillMod(actor, "acid", getForceProtection(item));
core.skillModService.deductSkillMod(actor, "electricity", getForceProtection(item));
}
private int getForceProtection(SWGObject item) {
src/services/PlayerService.java
+2 -4
View File
@@ -652,11 +652,9 @@ public class PlayerService implements INetworkDispatch {
return;
}
resetLevel(creature);
if(level == 0) return;
if (level == 0) {
return;
}
resetLevel(creature);
try {
experienceTable = ClientFileManager.loadFile("datatables/player/player_level.iff", DatatableVisitor.class);