Skip to content

Fix visible weapons #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Computerwhz wants to merge 1 commit into from
Closed

Fix visible weapons #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Modules/Invisible.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
info.TransmitEntities.Remove(entity);
}

if (Globals.InvisiblePlayers.ContainsKey(player))
{
foreach (var weapon in player!.PlayerPawn.Value.WeaponServices.MyWeapons)

Check warning on line 28 in src/Modules/Invisible.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

Dereference of a possibly null reference.

Check warning on line 28 in src/Modules/Invisible.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

Dereference of a possibly null reference.
{
info.TransmitEntities.Remove(weapon);
}
}

if (gameRules.GameRules!.WarmupPeriod) return;

var c4s = Utilities.FindAllEntitiesByDesignerName<CC4>("weapon_c4");
Expand All @@ -45,13 +53,13 @@
{
if (!Util.IsPlayerValid(invis.Key)) continue;

var currentWeapon = invis.Key.PlayerPawn.Value.WeaponServices.ActiveWeapon.Get().As<CCSWeaponBase>();

Check warning on line 56 in src/Modules/Invisible.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

Dereference of a possibly null reference.

Check warning on line 56 in src/Modules/Invisible.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

Dereference of a possibly null reference.

Check warning on line 56 in src/Modules/Invisible.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

Dereference of a possibly null reference.
if (currentWeapon.InReload && !invis.Value.HackyReload)
{
var data = Globals.InvisiblePlayers[invis.Key];
data.HackyReload = true;
Globals.InvisiblePlayers[invis.Key] = data;
SetPlayerInvisibleFor(invis.Key, currentWeapon.VData.DisallowAttackAfterReloadStartDuration);

Check warning on line 62 in src/Modules/Invisible.cs

View workflow job for this annotation

GitHub Actions / build (Release) 

Dereference of a possibly null reference.
}


Expand Down
Loading