Skip to content

Commit 55d2dee

Browse files
committed
1 parent 43fc940 commit 55d2dee

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

game/quiver/info_changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ Added the following Source SDK Pull Requests:
8383
- #1525: Add more functionality to Input<name>() callback in VScript
8484
- #1528: Add a non full charge sound check to tf_weapon_sniperrifle.cpp
8585
- #1529: Add DevMsgs for returns in CBaseCombatWeapon::WeaponSound
86+
- #1530: Allow null caller on team_control_point's SetOwner input
8687

8788
Details:
8889
- Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/server/team_control_point.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,12 @@ void CTeamControlPoint::InputSetOwner( inputdata_t &input )
336336

337337
Assert( iCapTeam >= 0 && iCapTeam < GetNumberOfTeams() );
338338

339+
#ifndef BDSBASE
339340
Assert( input.pCaller );
340341

341342
if ( !input.pCaller )
342343
return;
344+
#endif
343345

344346
if ( GetOwner() == iCapTeam )
345347
return;
@@ -349,7 +351,11 @@ void CTeamControlPoint::InputSetOwner( inputdata_t &input )
349351
// must be done before setting the owner
350352
HandleScoring( iCapTeam );
351353

354+
#ifdef BDSBASE
355+
if (input.pCaller && input.pCaller->IsPlayer())
356+
#else
352357
if ( input.pCaller->IsPlayer() )
358+
#endif
353359
{
354360
int iCappingPlayer = input.pCaller->entindex();
355361
InternalSetOwner( iCapTeam, true, 1, &iCappingPlayer );

0 commit comments

Comments
 (0)