Changed holo-emote script checks, fixed playerobject version, fixed hair check

scripts/commands/holoemote.py

@@ -9,9 +9,17 @@ def run(core, actor, target, commandString):
 	if player is None:
 		return
 	
-	commandString = commandString.lower()
-	installedEmote = player.getHoloEmote().replace('holoemote_','')
+	if commandString is not None:
+		commandString = commandString.lower()
 	
+	installedEmote = ''
+	
+	if player.getHoloEmote() is not None:
+		installedEmote = player.getHoloEmote().replace('holoemote_','')
+	
+	if commandString is None or commandString == "":
+		commandString == installedEmote
+
 	if installedEmote == None or installedEmote == "":
 		actor.sendSystemMessage('@image_designer:no_holoemote', 0)
 		return
@@ -28,9 +36,6 @@ def run(core, actor, target, commandString):
 	if commandString == "kitty":
 		commandString = "technokitty"
 	
-	if commandString is None or commandString == "":
-		commandString == installedEmote
-	
 	if commandString != installedEmote and installedEmote != 'all':
 		actor.sendSystemMessage('Your installed Holo-Emote generator does not support that emote.', 0)
 		return

scripts/commands/imagedesign.py

@@ -8,7 +8,7 @@ def setup():
 def run(core, actor, target, commandString):
 
 	if target is None and commandString is None:
-		design = ImageDesignStartMessage(actor.getObjectId(), actor.getObjectId(), target.getObjectId())
+		design = ImageDesignStartMessage(actor.getObjectId(), actor.getObjectId(), actor.getObjectId())
 		obj = ObjControllerMessage(11, design)
 		actor.getClient().getSession().write(obj.serialize())
 		return

src/resources/objects/player/PlayerObject.java

@@ -43,7 +43,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=7)
+@Persistent(version=8)
 public class PlayerObject extends IntangibleObject {
 	
 	// PLAY 3

src/services/EntertainmentService.java

@@ -872,10 +872,9 @@ public class EntertainmentService implements INetworkDispatch {
 	
 	private void handleImageDesign(CreatureObject designer, CreatureObject designTarget, Vector<IDAttribute> colorAttributes, Vector<IDAttribute> bodyAttributes, String hairTemplate, String holoEmote) {
 
-		if(!hairTemplate.startsWith("object/tangible/hair/")) return;
-		
 		if (hairTemplate != null && !hairTemplate.equals("")) {
-			System.out.println(hairTemplate);
+			if(!hairTemplate.startsWith("object/tangible/hair/"))
+				return;
 			String sharedHairTemplate = hairTemplate.replace("/hair_", "/shared_hair_");
 			TangibleObject hairObject = (TangibleObject) core.objectService.createObject(sharedHairTemplate, designTarget.getPlanet());