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 elytra #597

Merged
merged 31 commits into from
Aug 3, 2022
Merged

Implemented elytra #597

merged 31 commits into from
Aug 3, 2022

Conversation

JustTalDevelops
Copy link
Member

@JustTalDevelops JustTalDevelops commented Jul 25, 2022 •
edited
Loading

No description provided.

@JustTalDevelops JustTalDevelops changed the base branch from master to feature/fireworks July 25, 2022 01:39
@JustTalDevelops JustTalDevelops marked this pull request as ready for review July 25, 2022 03:11
@JustTalDevelops JustTalDevelops added the feature New feature or request label Jul 25, 2022
@JustTalDevelops JustTalDevelops mentioned this pull request Jul 25, 2022
Open
89 tasks
Base automatically changed from feature/fireworks to master July 29, 2022 20:40
@JustTalDevelops
Merge remote-tracking branch 'origin/master' into feature/elytra
9415187 
# Conflicts:
#	server/entity/action.go
#	server/entity/firework.go
#	server/entity/register.go
#	server/item/ender_pearl.go
#	server/item/firework.go
#	server/item/firework_explosion.go
#	server/item/register.go
#	server/item/snowball.go
#	server/item/splash_potion.go
#	server/player/player.go
#	server/session/entity_metadata.go
#	server/session/world.go
@JustTalDevelops
player/player.go: Various fixes.
9d661ae
@JustTalDevelops
world/world.go: Set EntityType for sound.Fall.
7ab5585
DaPigGuy
DaPigGuy reviewed Aug 1, 2022
View reviewed changes
server/player/player.go Outdated Show resolved Hide resolved
DaPigGuy
DaPigGuy reviewed Aug 1, 2022
View reviewed changes
server/item/durability.go Outdated Show resolved Hide resolved
Sandertv
Sandertv requested changes Aug 1, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

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

This looks fine mostly. Got a couple of minor comments.

server/entity/firework.go Outdated Show resolved Hide resolved
server/item/elytra.go Show resolved Hide resolved
server/player/player.go Outdated Show resolved Hide resolved
@JustTalDevelops
Copy link
Member Author

Also added validation, ensuring a player has an elytra before letting them fly.

DaPigGuy
DaPigGuy reviewed Aug 2, 2022
View reviewed changes
server/item/elytra.go Outdated Show resolved Hide resolved
DaPigGuy
DaPigGuy reviewed Aug 2, 2022
View reviewed changes
server/player/player.go Outdated Show resolved Hide resolved
DaPigGuy
DaPigGuy reviewed Aug 2, 2022
View reviewed changes
server/player/player.go Outdated Show resolved Hide resolved
@Sandertv
Copy link
Member

Sandertv commented Aug 2, 2022

71e6fb1 adds sounds when fast equipping. Could you add the case for elytras and assign the right sound event for them in session/world.go?

Sandertv
Sandertv approved these changes Aug 3, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for the PR!

@Sandertv Sandertv merged commit 371dfd8 into master Aug 3, 2022
@Sandertv Sandertv deleted the feature/elytra branch August 3, 2022 11:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DaPigGuy DaPigGuy DaPigGuy approved these changes

@Sandertv Sandertv Sandertv approved these changes

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.
3 participants
@JustTalDevelops @Sandertv @DaPigGuy