Skip to content
This repository has been archived by the owner on Apr 29, 2020. It is now read-only.

Fix for being able to ranged attack while resting/synthing/sitting #6328

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix for being able to ranged attack while resting/synthing/sitting #6328

wants to merge 11 commits into from

Conversation

Caelic
Copy link
Contributor

@Caelic Caelic commented Dec 16, 2019

CanChangeState() function doesn't catch character animations such as resting/synthing/sitting for allowing or disallowing ranged attack. you are currently able to ranged attack freely while doing these 3 actions.

Caelic added 11 commits December 2, 2019 18:01
entry point for RA state, disallow RA if resting/synthing/sitting
completion check for RA, disallow completion of the RA if the player has started resting/synthing/sitting during their aiming
@Caelic
Copy link
Contributor Author

Caelic commented Dec 16, 2019

is there a way to clean out those unrelated changelogs in my master branch? i don't want to fully delete it and re-fork because i have other pull requests pending off that fork right now.

only those last two commit changes apply to this pull request.

@TeoTwawki
Copy link
Member

@TeoTwawki
Copy link
Member

you should avoid using master for exactly this reason. Make a separate branch for each thing you are working on / pull requesting. If your server is on your fork as well, give it its own branch as well. Keep master a 1:1: copy of Darkstar's master.

@TeoTwawki
Copy link
Member

code itself seems fine

@TeoTwawki
Copy link
Member

if you need help with that rebase hit me up on discord this weekend.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants