From 97796bf5249064d8ed68b5af27bf1277f60cda21 Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Mon, 3 Oct 2016 15:45:13 -0400
Subject: [PATCH] Update change log

---
 CHANGE LOG 1.0.6.txt                       | 1 +
 SQF/dayz_code/compile/fn_damageHandler.sqf | 2 +-
 SQF/dayz_code/compile/player_death.sqf     | 2 +-
 SQF/dayz_code/compile/veh_setFixServer.sqf | 2 +-
 SQF/dayz_code/stringtable.xml              | 3 +--
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt
index bd961d588..dad9f2692 100644
--- a/CHANGE LOG 1.0.6.txt	
+++ b/CHANGE LOG 1.0.6.txt	
@@ -115,6 +115,7 @@
 [FIXED] Players will no longer end up swimming in the ground after spawn, relog or clothes change on maps with respawn_west in the water. @ebaydayz
 [FIXED] It is no longer possible to drag players through base walls when they are unconscious. @icomrade
 [FIXED] Purchased vehicles should no longer spawn inside each other on trader helipads. @icomrade
+[FIXED] Humanity hit is now applied correctly to players shooting from vehicles. @ebaydayz
 
 [UPDATED] .hpp files updated in dayz_code\Configs\CfgLoot\CfgBuildingPos. @Uro1
 [UPDATED] .bat files updated in Config-Examples @Raziel23x
diff --git a/SQF/dayz_code/compile/fn_damageHandler.sqf b/SQF/dayz_code/compile/fn_damageHandler.sqf
index 7b1913c23..e0bffcb53 100644
--- a/SQF/dayz_code/compile/fn_damageHandler.sqf
+++ b/SQF/dayz_code/compile/fn_damageHandler.sqf
@@ -75,7 +75,7 @@ if (_unit == player) then {
 
     if (_hit == "") exitWith //Ignore none part dmg. Exit after processing humanity hit
 	{
-        if ((_source != player) and _isPlayer && alive player) then
+        if (_source != player && _isPlayer && alive player) then
 		{
 			_isBandit = (player getVariable["humanity",0]) <= -5000;
 			//_isBandit = (_model in ["Bandit1_DZ","BanditW1_DZ"]);
diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf
index 2446d8595..a0fe2f8a6 100644
--- a/SQF/dayz_code/compile/player_death.sqf
+++ b/SQF/dayz_code/compile/player_death.sqf
@@ -141,7 +141,7 @@ playMusic "dayz_track_death_1";
 uiSleep 2;
 
 for  "_x" from 5 to 1 step -1 do {
-	titleText [format[localize "str_return_lobby",_x], "PLAIN DOWN", 1];
+	titleText [format[localize "str_return_lobby", _x], "PLAIN DOWN", 1];
 	uiSleep 1;
 };
 
diff --git a/SQF/dayz_code/compile/veh_setFixServer.sqf b/SQF/dayz_code/compile/veh_setFixServer.sqf
index 2a0feb0e1..510f00282 100644
--- a/SQF/dayz_code/compile/veh_setFixServer.sqf
+++ b/SQF/dayz_code/compile/veh_setFixServer.sqf
@@ -11,6 +11,6 @@ if (_selection != "" and local _unit) then {
 	if (_damage == 0) then {
 		[_unit,"repair"] call server_updateObject;
 	} else {
-		[_unit,"damage"] call server_updateObject;	
+		[_unit,"damage"] call server_updateObject;
 	};
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 114b8e603..705e114bf 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -3839,7 +3839,6 @@
 		<Key ID="STR_EQUIP_DESC_HERBBOX">
 			<English>Box of medicinal herbs</English>
 			<Russian>Коробка лекарственных трав</Russian>
-			<Spanish>Box of medicinal herbs</Spanish>
 			<Czech>Krabice plná nejrůznějších léčivých rostlin. Sen každé babky kořenářky.</Czech>
 			<German>Eine Schachtel mit medizinischen Kräutern.</German>
 		</Key>
@@ -6624,7 +6623,7 @@
 		<Key ID="str_player_consumed_food_2">
 			<English>You ate %1 but spit out most of it. You&apos;re too full to eat anything.</English>
 			<German>Du versuchst %1 zu essen, musst aber das meiste wieder ausspucken. Du bist einfach zu satt, um noch mehr zu essen.</German>
-			<Russian>Вы съели %1, но выплюнули большую часть.\nВы слишком сыты, чтобы проглотить что-нибуть еще.</Russian>
+			<Russian>Вы съели %1, но выплюнули большую часть. Вы слишком сыты, чтобы проглотить что-нибуть еще.</Russian>
 			<Spanish>Comiste %1 pero escupiste la mayor parte. Estás demasiado lleno para seguir comiendo.</Spanish>
 			<French>Vous n&apos;avez pas pu terminer votre %1. Vous avez trop mangé.</French>
 			<Czech>Snědli jste %1, ale většinu jste vyplivnul. Jste plný a víc toho už nesníte.</Czech>