Skip to content
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

Removes some duplicate code. #113

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

DeltaFire15
Copy link

@DeltaFire15 DeltaFire15 commented Jan 7, 2025

Description of changes

I looked at some diffs and noticed some code duplication (likely from some merge conflict), so I decided I may aswell just fix it over opening an issue.

This removes some duplicate code in the changed file, which was an exact match of the remaining version (slightly above the removed code).

Why and what will this PR improve

This removes the potential for confusion by the same section of code existing twice in the code, resolving some aftereffects of a merge conflict resolution process.

Authorship

I am the author.

Changelog

🆑
code: Removed some duplicate code in a map level file (no gameplay effect).
/:cl:

(see l. 21 - 45 for original)
Copy link

@MistakeNot4892 MistakeNot4892 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this looks like merge skew or copypaste error on my part.

Noting for a future PR that we need to repath all the Karzerfeste level data from player_level to main_level like we've done on Neb upstream.

@MistakeNot4892 MistakeNot4892 merged commit f51d465 into PyrelightSS13:dev Jan 8, 2025
14 checks passed
@DeltaFire15 DeltaFire15 deleted the duplicate-code branch January 8, 2025 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants