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

Pull upstream #73

Merged
merged 32 commits into from
Sep 9, 2024
Merged

Pull upstream #73

merged 32 commits into from
Sep 9, 2024

Conversation

TheMeinerLP
Copy link
Collaborator

@TheMeinerLP TheMeinerLP commented Sep 9, 2024

Proposed changes

Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue.

Types of changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation Update (if none of the other choices apply)

Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of
them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before
merging your code.

  • I have read the CONTRIBUTING.md
  • I have added tests that prove my fix is effective or that my feature works
  • I have added necessary documentation (if appropriate)

Further comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you
did and what alternatives you considered, etc...

Am-Gone and others added 27 commits August 20, 2024 14:40
…ld center (0,0,0) (Minestom#2299)

* fix: entity spawn pos desync

* Fix tests
* Update API for swept entity <-> entity collisions
* Move EntityCollisionResult to its own class
…2355)

* ability to get collision shape position from PhysicsResult
* Add EquipmentSlot.BODY

* EntityEquipmentPacket should now have 7 entries

* Simplify isHand check

* Fix tests

---------

Co-authored-by: Matt Worzala <35708499+mworzala@users.noreply.github.com>
)

* Fix chunks not being refreshed when view distance updates
)

* give more control of collisions to the entities colliding
* Add Instance::playSoundExcept

* Uh...
@TheMeinerLP TheMeinerLP requested a review from a team as a code owner September 9, 2024 08:38
Copy link

sonarcloud bot commented Sep 9, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
5.1% Duplication on New Code (required ≤ 3%)
C Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

Copy link

@theEvilReaper theEvilReaper left a comment

Choose a reason for hiding this comment

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

LGTM

@theEvilReaper theEvilReaper merged commit e49d3af into master Sep 9, 2024
5 of 6 checks passed
@theEvilReaper theEvilReaper deleted the feature/upstream-update branch September 9, 2024 20:00
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.