Fixed Force Less Lethal not working correctly on dedicated servers.

Author: eezstreet

Source/Game/SwatGame/Classes/LoadOut/LoadOut.uc

@@ -292,6 +292,8 @@ simulated protected function SpawnEquipmentForPocket( Pocket i, class<actor> Equ
 
     PocketEquipment[i] = Owner.Spawn(EquipmentClass, Owner);
 
+	mplog(" ...SpawnEquipmentForPocket("$i$", "$EquipmentClass$") --> "$PocketEquipment[i]);
+
     assertWithDescription(PocketEquipment[i] != None,
         "LoadOut "$name$" failed to spawn PocketEquipment item in pocket "$GetEnum(Pocket,i)$" of class "$EquipmentClass$".");
 

Source/Game/SwatGame/Classes/Net/NetPlayer.uc

@@ -107,6 +107,7 @@ function InitializeReplicatedCounts()
     for ( i = 0; i < Pocket.EnumCount; ++i )
     {
 		//assert(i != Pocket.Pocket_CustomSkin || ReplicatedLoadOutSpec[i] == None);
+		mplog("---NetPlayer::InitializeReplicatedCounts("$i$") = "$ReplicatedLoadoutSpec[i]);
         if ( ReplicatedLoadOutSpec[i] != None )
             ++LoadOutSpecCount;
     }
@@ -244,6 +245,25 @@ simulated event PostReplication()
 	    mplog( self$" has name: "$GetHumanReadableName() );
 }
 
+event PostNetReceive()
+{
+	local OfficerLoadout NewLoadout;
+
+	if(ReplicatedLoadoutSpec[0] != DynamicLoadoutSpec.LoadOutSpec[0])
+	{
+		// Our loadout got forced to something else by the server. Adjust. Adapt. Overcome.
+		NewLoadOut = Spawn(class'OfficerLoadOut', self, 'EmptyMultiplayerOfficerLoadOut' );
+
+		CopyReplicatedSpecToDynamicSpec();
+
+		NewLoadout.Initialize(DynamicLoadoutSpec, false);
+		ReceiveLoadout(NewLoadout);
+
+		CheckDesiredItemAndEquipIfNeeded();
+
+		SwatGamePlayerController(Controller).EquipNextSlot();
+	}
+}
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -799,11 +819,6 @@ simulated function OnDoorUnlocked( SwatDoor TheDoor )
 simulated function DynamicLoadOutSpec GetLoadoutSpec()
 {
     //mplog( self$"---NetPlayer::GetLoadoutSpec()." );
-	if(SwatGamePlayerController(Controller) != None && SwatGamePlayerController(Controller).SwatRepoPlayerItem.bForcedLessLethal)
-	{
-		return SwatGameInfo(Level.Game).Admin.GetLessLethalSpec();
-	}
-
     if( DynamicLoadOutSpec == None )
     {
         if ( IsTheVIP() )
@@ -1009,6 +1024,8 @@ defaultproperties
 
     TeamNumber=-1
 
+	bNetNotify=true
+
     bLoadOutInitialized=false
     LoadOutSpecCount=0
     SkinsCount=0

Source/Game/SwatGame/Classes/SwatAdmin.uc

@@ -739,6 +739,7 @@ public function bool ForceLessLethalOnPlayer(SwatGamePlayerController PC)
 	local int i;
 	local NetPlayer Player;
 	local OfficerLoadout NewLoadout;
+	local DynamicLoadoutSpec OldSpec;
 
 	RepoItem = PC.SwatRepoPlayerItem;
 
@@ -758,25 +759,28 @@ public function bool ForceLessLethalOnPlayer(SwatGamePlayerController PC)
 		return false;
 	}
 
+	NewLoadout = Spawn(class'OfficerLoadout', Player, 'EmptyMultiplayerOfficerLoadOut');
+
 	for(i = 0; i < Pocket.EnumCount; i++)
 	{
-		if(Player != None)
-		{
-			Player.SetPocketItemClass(Pocket(i), NewSpec.LoadOutSpec[i]);
-		}
-
-		RepoItem.SetPocketItemClass(Pocket(i), NewSpec.LoadOutSpec[i]);
+		RepoItem.RepoLoadOutSpec[i] = NewSpec.LoadOutSpec[i];
 	}
 
 	PC.SetMPLoadOut(NewSpec);
+
 	if(Player != None)
 	{
-		NewLoadout = Spawn(class'OfficerLoadout', Player, 'EmptyMultiplayerOfficerLoadOut');
+		OldSpec = Player.GetLoadoutSpec();
+		for(i = 0; i < Pocket.EnumCount; i++)
+		{
+			Player.SetPocketItemClass(Pocket(i), RepoItem.RepoLoadOutSpec[i]);
+			OldSpec.LoadOutSpec[i] = RepoItem.RepoLoadOutSpec[i];
+		}
+
 		NewLoadout.Initialize(NewSpec, false);
 		Player.ReceiveLoadOut(NewLoadout);
 		Player.InitializeReplicatedCounts();
 		SwatGameInfo(Level.Game).SetPlayerDefaults(Player);
-		PC.EquipNextSlot();
 	}
 
 	RepoItem.bForcedLessLethal = true;

Source/Game/SwatGame/Classes/SwatGameInfo.uc

@@ -1135,11 +1135,22 @@ function AddDefaultInventory(Pawn inPlayerPawn)
 			else
 				theNetPlayer.SetCustomSkinClassName( "SwatGame.DefaultCustomSkin" );
 
-            LoadOutSpec = theNetPlayer.GetLoadoutSpec();
+			if(RepoPlayerItem.bForcedLessLethal)
+			{
+				LoadOutSpec = Admin.GetLessLethalSpec();
+				for(i = 0; i < Pocket.EnumCount; i++)
+				{
+					theNetPlayer.ReplicatedLoadOutSpec[i] = LoadOutSpec.LoadOutSpec[i];
+				}
+			}
+			else
+			{
+				LoadOutSpec = theNetPlayer.GetLoadoutSpec();
 
-            // Alter it *ex post facto* to have the correct ammo counts
-            LoadOutSpec.SetPrimaryAmmoCount(RepoPlayerItem.GetPrimaryAmmoCount());
-            LoadOutSpec.SetSecondaryAmmoCount(RepoPlayerItem.GetSecondaryAmmoCount());
+				// Alter it *ex post facto* to have the correct ammo counts
+	            LoadOutSpec.SetPrimaryAmmoCount(RepoPlayerItem.GetPrimaryAmmoCount());
+	            LoadOutSpec.SetSecondaryAmmoCount(RepoPlayerItem.GetSecondaryAmmoCount());
+			}
         }
 
 		IsSuspect = theNetPlayer.GetTeamNumber() == 1;

Source/Game/SwatGame/Classes/SwatGamePlayerController.uc

@@ -308,7 +308,7 @@ replication
         ServerRequestThrowPrep, ServerEndThrow, ServerRequestQualifyInterrupt, /*ServerRequestInteract,*/
         ServerRequestViewportChange, ServerSetAlwaysRun, ServerActivateOfficerViewport,
         ServerGiveCommand, ServerIssueCompliance, ServerOnEffectStopped, ServerSetVoiceType,
-		    ServerRetryStatsAuth, ServerSetMPLoadOutPrimaryAmmo, ServerSetMPLoadOutSecondaryAmmo,
+		ServerRetryStatsAuth, ServerSetMPLoadOutPrimaryAmmo, ServerSetMPLoadOutSecondaryAmmo,
         ServerViewportActivate, ServerViewportDeactivate,
         ServerHandleViewportFire, ServerHandleViewportReload;
 }
@@ -6103,7 +6103,6 @@ function ClientSetObjectiveVisibility( string ObjectiveName, bool Visible )
     Repo.SetObjectiveVisibility( name(ObjectiveName), Visible );
 }
 
-
 simulated function ClientReportableReportedToTOC( IAmReportableCharacter ReportableCharacter, string inUniqueID, string PlayerTag, string PlayerName )
 {
     local SwatPlayer Player;

Source/Game/SwatGame/Classes/SwatRepoPlayerItem.uc

@@ -66,11 +66,6 @@ function SetSecondaryAmmoCount(int amount) {
 function SetPocketItemClass( Pocket Pocket, class<actor> ItemClass )
 {
     //log( self$" in SwatRepoPlayerItem::SetPocketItemClass(). Pocket="$Pocket$", Item="$ItemClass );
-	if(bForcedLessLethal)
-	{
-		return;
-	}
-
 	RepoLoadOutSpec[ Pocket ] = ItemClass;
 }
 
@@ -86,11 +81,6 @@ function SetPocketItemClassName( Pocket Pocket, string ItemClassName )
         ItemClass = class<HandheldEquipment>(DynamicLoadObject(ItemClassName, class'Class'));
     }
 
-	if(bForcedLessLethal)
-	{
-		return;
-	}
-	
     SetPocketItemClass( Pocket, ItemClass );
 }