-
-
Notifications
You must be signed in to change notification settings - Fork 851
Fix collision for copper bars and turtle eggs #6555
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
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright (c) 2019-2025 GeyserMC. http://geysermc.org | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| * | ||
| * @author GeyserMC | ||
| * @link https://github.com/GeyserMC/Geyser | ||
| */ | ||
|
|
||
| package org.geysermc.geyser.translator.collision.fixes; | ||
|
|
||
| import lombok.EqualsAndHashCode; | ||
| import org.geysermc.geyser.level.block.type.BlockState; | ||
| import org.geysermc.geyser.level.physics.BoundingBox; | ||
| import org.geysermc.geyser.level.physics.Direction; | ||
| import org.geysermc.geyser.session.GeyserSession; | ||
| import org.geysermc.geyser.translator.collision.BlockCollision; | ||
| import org.geysermc.geyser.translator.collision.CollisionRemapper; | ||
|
|
||
| @EqualsAndHashCode(callSuper = true) | ||
| @CollisionRemapper(regex = "^turtle_egg$", passDefaultBoxes = true) | ||
| public class TurtleEggCollision extends BlockCollision { | ||
| public TurtleEggCollision(BlockState state, BoundingBox[] boxes) { | ||
| super(boxes); | ||
| } | ||
|
|
||
| @Override | ||
| protected void correctPosition(GeyserSession session, int x, int y, int z, BoundingBox blockCollision, BoundingBox playerCollision, double ulpX, double ulpZ) { | ||
| // Bedrock's box is narrower than Java's with multiple eggs, so push the player out by the 0.1375 difference. | ||
| blockCollision.pushOutOfBoundingBox(playerCollision, Direction.NORTH, 0.1375 + ulpZ); | ||
| blockCollision.pushOutOfBoundingBox(playerCollision, Direction.SOUTH, 0.1375 + ulpZ); | ||
| blockCollision.pushOutOfBoundingBox(playerCollision, Direction.EAST, 0.1375 + ulpX); | ||
| blockCollision.pushOutOfBoundingBox(playerCollision, Direction.WEST, 0.1375 + ulpX); | ||
|
Comment on lines
+45
to
+49
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Quick question - is this box always the same regardless of egg count; or are only specific counts affected? We have the block state (and therefore, block properties) available here to do a check properly
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Always the same according to my BDS dump |
||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this only applies to multiple eggs? can we only apply the pushing when it's multiple eggs (using state, you can check other collision class for example)
also what about Y collision, or that's not needed.