From d4213197e9da3f9ea05fd87c583a1caa30af3111 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Fri, 30 Oct 2015 13:30:22 -0500
Subject: [PATCH] more script fixes

---
 .../sys.server/compiled/game/script/ai/ai.script |  2 +-
 .../game/script/ai/smuggler_buddy.script         |  4 ++--
 .../game/script/ai/smuggler_medic.script         |  4 ++--
 .../compiled/game/script/ai/spy_decoy.script     |  4 ++--
 .../missions/base/mission_dynamic_base.script    | 16 ++++++++++++++++
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/sku.0/sys.server/compiled/game/script/ai/ai.script b/sku.0/sys.server/compiled/game/script/ai/ai.script
index 520937134..bc0d1ef51 100644
--- a/sku.0/sys.server/compiled/game/script/ai/ai.script
+++ b/sku.0/sys.server/compiled/game/script/ai/ai.script
@@ -1345,7 +1345,7 @@ trigger OnIncapacitated(obj_id attacker)
 		{
 			obj_id[] haters = getHateList(self);
 
-			if (haters != null || haters.length > 0)
+			if (haters.length > 0)
 			{
 				for(int i=0;i<haters.length;i++)
 				{
diff --git a/sku.0/sys.server/compiled/game/script/ai/smuggler_buddy.script b/sku.0/sys.server/compiled/game/script/ai/smuggler_buddy.script
index f6f703807..abbc3a329 100644
--- a/sku.0/sys.server/compiled/game/script/ai/smuggler_buddy.script
+++ b/sku.0/sys.server/compiled/game/script/ai/smuggler_buddy.script
@@ -137,7 +137,7 @@ trigger OnIncapacitated(obj_id attacker)
 	{
 		obj_id[] haters = getHateList(self);
 
-		if (haters != null || haters.length > 0)
+		if (haters.length > 0)
 		{
 			for(int i=0;i<haters.length;i++)
 			{
@@ -151,4 +151,4 @@ trigger OnIncapacitated(obj_id attacker)
 	clearCondition(self, CONDITION_INTERESTING);
 	
 	return SCRIPT_CONTINUE;
-}
\ No newline at end of file
+}
diff --git a/sku.0/sys.server/compiled/game/script/ai/smuggler_medic.script b/sku.0/sys.server/compiled/game/script/ai/smuggler_medic.script
index 7127ad8c2..6d5942dc4 100644
--- a/sku.0/sys.server/compiled/game/script/ai/smuggler_medic.script
+++ b/sku.0/sys.server/compiled/game/script/ai/smuggler_medic.script
@@ -199,7 +199,7 @@ trigger OnIncapacitated(obj_id attacker)
 	{
 		obj_id[] haters = getHateList(self);
 
-		if (haters != null || haters.length > 0)
+		if (haters.length > 0)
 		{
 			for(int i=0;i<haters.length;i++)
 			{
@@ -213,4 +213,4 @@ trigger OnIncapacitated(obj_id attacker)
 	clearCondition(self, CONDITION_INTERESTING);
 	
 	return SCRIPT_CONTINUE;
-}
\ No newline at end of file
+}
diff --git a/sku.0/sys.server/compiled/game/script/ai/spy_decoy.script b/sku.0/sys.server/compiled/game/script/ai/spy_decoy.script
index 2dd685ad2..a0bf8944e 100644
--- a/sku.0/sys.server/compiled/game/script/ai/spy_decoy.script
+++ b/sku.0/sys.server/compiled/game/script/ai/spy_decoy.script
@@ -72,7 +72,7 @@ messageHandler handleDecoyCleanup()
 {
 	obj_id[] haters = getHateList(self);
 
-	if (haters != null || haters.length > 0)
+	if (haters.length > 0)
 	{
 		for(int i=0;i<haters.length;i++)
 		{
@@ -88,4 +88,4 @@ messageHandler queue_ad()
 {
 	queueCommand(self, ##"sp_avoid_damage", self, "", COMMAND_PRIORITY_DEFAULT);
 	return SCRIPT_CONTINUE;
-}
\ No newline at end of file
+}
diff --git a/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_dynamic_base.script b/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_dynamic_base.script
index 65077c0b4..b801ee927 100644
--- a/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_dynamic_base.script
+++ b/sku.0/sys.server/compiled/game/script/systems/missions/base/mission_dynamic_base.script
@@ -2519,20 +2519,28 @@ string getRandomMissionCreatorName()
 	{
 		case 1:
 			strTemplate = "object/creature/player/bothan_male.iff";
+			break;
 		case 2:
 			strTemplate = "object/creature/player/moncal_male.iff";
+			break;
 		case 3:
 			strTemplate = "object/creature/player/trandoshan_male.iff";
+			break;
 		case 4:
 			strTemplate = "object/creature/player/twilek_male.iff";
+			break;
 		case 5:
 			strTemplate = "object/creature/player/rodian_male.iff";
+			break;
 		case 6:
 			strTemplate = "object/creature/player/zabrak_male.iff";
+			break;
 		case 7:
 			strTemplate = "object/creature/player/wookiee_male.iff";
+			break;
 		case 8:
 			strTemplate = "object/creature/player/human_male.iff";
+			break;
 	}
 
 	//PROFILER_START("Actual name call");
@@ -2555,20 +2563,28 @@ string getRandomSpeciesName(string strSpecies)
 		{
 			case 1:
 				strTemplate = "object/creature/player/bothan_male.iff";
+				break;
 			case 2:
 				strTemplate = "object/creature/player/moncal_male.iff";
+				break;
 			case 3:
 				strTemplate = "object/creature/player/trandoshan_male.iff";
+				break;
 			case 4:
 				strTemplate = "object/creature/player/twilek_male.iff";
+				break;
 			case 5:
 				strTemplate = "object/creature/player/rodian_male.iff";
+				break;
 			case 6:
 				strTemplate = "object/creature/player/zabrak_male.iff";
+				break;
 			case 7:
 				strTemplate = "object/creature/player/wookiee_male.iff";
+				break;
 			case 8:
 				strTemplate = "object/creature/player/human_male.iff";
+				break;
 		}
 
 	}