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.

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

Jump to bottom

Implemented lingering potions and area effect clouds #586

Merged
merged 19 commits into from
Aug 1, 2022
Merged

Implemented lingering potions and area effect clouds #586

merged 19 commits into from
Aug 1, 2022

Conversation

JustTalDevelops
Copy link
Member

No description provided.

@JustTalDevelops JustTalDevelops added the feature New feature or request label Jul 22, 2022
@JustTalDevelops JustTalDevelops mentioned this pull request Jul 22, 2022
Open
89 tasks
DaPigGuy
DaPigGuy requested changes Jul 22, 2022
View reviewed changes
server/entity/splashable.go Outdated Show resolved Hide resolved
Sandertv
Sandertv approved these changes Aug 1, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment •
edited
Loading

Choose a reason for hiding this comment

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

This looks good to me, thanks for the PR! I've got one small comment for changing two function names. Should be good once resolved and once conflicts are resolved.

server/entity/area_effect_cloud.go Outdated Show resolved Hide resolved
JustTalDevelops and others added 6 commits August 1, 2022 18:04
@JustTalDevelops
entity/area_effect_cloud.go: Renamed function names.
7cd2b9c
@JustTalDevelops @github-actions
updated contributor list
b7e3f36
@JustTalDevelops
Merge remote-tracking branch 'origin/master' into feature/lingering-p…
d07ff08 
…otions

# Conflicts:
#	server/entity/effect/effect.go
#	server/entity/register.go
#	server/entity/splash_potion.go
#	server/item/register.go
#	server/item/splash_potion.go
#	server/session/entity_metadata.go
@JustTalDevelops
item/lingering_potion.go: Fixed post-merge issues.
344a4d3
@JustTalDevelops
Merge remote-tracking branch 'origin/feature/lingering-potions' into …
b326351 
…feature/lingering-potions
@JustTalDevelops @github-actions
updated contributor list
4a226be
@JustTalDevelops
Copy link
Member Author

This should be ready to merge now.

@Sandertv Sandertv merged commit 432927f into master Aug 1, 2022
@Sandertv Sandertv deleted the feature/lingering-potions branch August 1, 2022 23:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sandertv Sandertv Sandertv approved these changes

@DaPigGuy DaPigGuy Awaiting requested review from DaPigGuy

@T14Raptor T14Raptor Awaiting requested review from T14Raptor

Assignees
No one assigned
Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@JustTalDevelops @DaPigGuy @Sandertv @T14Raptor