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

Fix Torch God biome torch swap issue #2353

Merged
merged 6 commits into from
May 29, 2021
Merged

Fix Torch God biome torch swap issue #2353

merged 6 commits into from
May 29, 2021

Conversation

moisterrific
Copy link
Contributor

@moisterrific moisterrific commented May 27, 2021

Can confirm this fixes the issue but not sure if it opens any new exploits

?????? HAVE YOU UPDATED THE CHANGELOG? ??????
not yet yes

Issue: #2344

Can confirm this fixes the issue but not sure if it opens any new exploits
Thanks to everyone who helped on discord
Copy link
Member

@hakusaro hakusaro left a comment

Choose a reason for hiding this comment

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

Thanks for your pull-request! Can you change the formatting so that you're indenting both the logical and et the arguments to ConsoleError so that they're easier to read?

TShockAPI/Bouncer.cs Outdated Show resolved Hide resolved
if (selectedItem.placeStyle != style)

if ((args.Player.TPlayer.BiomeTorchHoldStyle(style) != args.Player.TPlayer.BiomeTorchPlaceStyle(style))
&& (selectedItem.placeStyle != style))
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
&& (selectedItem.placeStyle != style))
&& (selectedItem.placeStyle != style))

@moisterrific
Copy link
Contributor Author

Thanks for your pull-request! Can you change the formatting so that you're indenting both the logical and et the arguments to ConsoleError so that they're easier to read?

sure thing

@hakusaro
Copy link
Member

sure thing

I actually fixed it for you but your fork isn't writable to us so I can't push it :S

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
Copy link
Member

@hakusaro hakusaro left a comment

Choose a reason for hiding this comment

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

lgtm_trick

@hakusaro hakusaro merged commit be2b817 into Pryaxis:general-devel May 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants