forked from Exiled-Official/EXILED
-
Notifications
You must be signed in to change notification settings - Fork 108
Fix Flashbang & HE #270
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.
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
Merged
Merged
Fix Flashbang & HE #270
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ namespace Exiled.Events.Patches.Events.Map | |
|
|
||
| using API.Features; | ||
| using API.Features.Pools; | ||
| using Exiled.API.Extensions; | ||
| using Exiled.Events.EventArgs.Map; | ||
| using Exiled.Events.Patches.Generic; | ||
| using Footprinting; | ||
|
|
@@ -63,14 +64,13 @@ private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstructi | |
| private static void ProcessEvent(FlashbangGrenade instance, float distance) | ||
| { | ||
| List<Player> targetToAffect = ListPool<Player>.Pool.Get(); | ||
| foreach (ReferenceHub referenceHub in ReferenceHub.AllHubs) | ||
| foreach (Player player in Player.List) | ||
| { | ||
| Player player = Player.Get(referenceHub); | ||
| if ((instance.transform.position - referenceHub.transform.position).sqrMagnitude >= distance) | ||
| if ((instance.transform.position - player.Position).sqrMagnitude >= distance) | ||
| continue; | ||
| if (!ExiledEvents.Instance.Config.CanFlashbangsAffectThrower && instance.PreviousOwner.LifeIdentifier != new Footprint(referenceHub).LifeIdentifier) | ||
| if (!ExiledEvents.Instance.Config.CanFlashbangsAffectThrower && instance.PreviousOwner.CompareLife(player.ReferenceHub)) | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This fixes flashbangs |
||
| continue; | ||
| if (!IndividualFriendlyFire.CheckFriendlyFirePlayer(instance.PreviousOwner, player.ReferenceHub) && instance.PreviousOwner.LifeIdentifier != new Footprint(referenceHub).LifeIdentifier) | ||
| if (!IndividualFriendlyFire.CheckFriendlyFirePlayer(instance.PreviousOwner, player.ReferenceHub) && !instance.PreviousOwner.CompareLife(player.ReferenceHub)) | ||
| continue; | ||
| if (Physics.Linecast(instance.transform.position, player.CameraTransform.position, instance._blindingMask)) | ||
| continue; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ | |
|
|
||
| namespace Exiled.Events.Patches.Generic | ||
| { | ||
| using Exiled.API.Extensions; | ||
|
|
||
| #pragma warning disable SA1402 | ||
| using System; | ||
| using System.Collections.Generic; | ||
|
|
@@ -96,8 +98,7 @@ public static bool CheckFriendlyFirePlayerRules(Footprint attackerFootprint, Ref | |
| return true; | ||
|
|
||
| // Only check friendlyFire if the FootPrint hasn't changed (Fix for Grenade not dealing damage because it's from a dead player) | ||
| // TODO rework FriendlyFireRule to make it compatible with Footprint | ||
| if (!attackerFootprint.Equals(new Footprint(attackerFootprint.Hub))) | ||
| if (!attackerFootprint.CompareLife(new Footprint(attackerFootprint.Hub))) | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This fixes grenades |
||
| return false; | ||
|
|
||
| // Check if attackerFootprint.Hub or victimHub is null and log debug information | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is technically better since we call Player.Get() immediately after