Update ValveSoftware#1192

Author: Bitl

game/quiver/info_changelog.txt

@@ -68,6 +68,7 @@ Quiver Private Alpha 1.1.0 (WIP):
 - Removed the headshot range restriction for the Railgun.
 - Bots can now use go-karts.
 - Bots can now use the Shortstop's shove.
+- Fixed a bug where bots continuously eat sandviches in spawn.
 - Added the following Source SDK Pull Requests:
 	- #1437: MvM: Fix Explosive Headshot working on invulnerable target
 	- #1440: Treat being in background map as not in-game

src/game/server/tf/tf_objective_resource.h

@@ -67,6 +67,9 @@ class CTFObjectiveResource : public CBaseTeamObjectiveResource
 	string_t GetMvMPopfileName( void ) const { return m_iszMvMPopfileName.Get(); }
 
 	void SetMannVsMachineEventPopfileType( int nType ){ m_nMvMEventPopfileType.Set( nType ); }
+#ifdef BDSBASE
+	int	GetMvMEventPopfileType(void) { return m_nMvMEventPopfileType; }
+#endif
 
 	string_t GetTeleporterString() const { return m_teleporterString; }
 

src/game/server/tf/tf_player.cpp

@@ -10006,7 +10006,7 @@ int CTFPlayer::OnTakeDamage( const CTakeDamageInfo &inputInfo )
 					pRandomInternalOrgan->KeyValue("origin", buf);
 					Q_snprintf(buf, sizeof(buf), "%.10f %.10f %.10f", GetAbsAngles().x, GetAbsAngles().y, GetAbsAngles().z);
 					pRandomInternalOrgan->KeyValue("angles", buf);
-					if (IsServerUsingTheFunnyMVMCvar() || (TFGameRules()->IsMannVsMachineMode() && GetTeamNumber() == TF_TEAM_PVE_INVADERS && BloodColor() == DONT_BLEED))
+					if (IsServerUsingTheFunnyMVMCvar() || (TFGameRules()->IsMannVsMachineMode() && GetTeamNumber() == TF_TEAM_PVE_INVADERS && BloodColor() == DONT_BLEED && TFObjectiveResource()->GetMvMEventPopfileType() != MVM_EVENT_POPFILE_HALLOWEEN))
 					{
 						//robots don't have spleens....
 						pRandomInternalOrgan->KeyValue("model", "models/player/gibs/gibs_bolt.mdl");