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

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

Browse Source 
Conflicts:
	scripts/houses/player_house_corellia_large_style_01.py
	scripts/houses/player_house_corellia_large_style_02.py
	src/resources/objects/tangible/Deed.java
	src/resources/objects/tangible/Harvester_Deed.java
	src/resources/objects/tangible/Player_House_Deed.java
	src/services/PlayerService.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2014-04-29 05:04:23 +01:00
parent 73f8ad85bc 63d0c5020d
commit 02ff93312e
229 changed files with 6226 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SkillModService.java
+1 -1
View File
@@ -127,7 +127,7 @@ public class SkillModService implements INetworkDispatch {
synchronized(creature.getMutex()) {
SkillMod skillMod = creature.getSkillMods().get(name);
if (skillMod == null || base <= 0 || modifier <= 0) {
if (skillMod == null || (base <= 0 && modifier <= 0)) {
return;
} else {
skillMod.deductBase(base);