projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-31 01:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into darkk_ent

Browse Source 
Conflicts:
	src/resources/objects/creature/CreatureMessageBuilder.java
	src/resources/objects/creature/CreatureObject.java
This commit is contained in:
darkk1138
2013-12-07 16:37:52 +01:00
parent 9683f4c164 21943d1934
commit 131092de60
129 changed files with 2348 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SkillService.java
+1 -1
View File
@@ -181,7 +181,7 @@ public class SkillService implements INetworkDispatch {
PlayerObject player = (PlayerObject) creature.getSlottedObject("ghost");
DatatableVisitor skillTable;
if (creature.getClient() == null) {
if (player == null) {
return;
}