Repo-Mirror/MoonriseMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Avoid collision shapes outside world border in findFreePosition

Browse Source 
This is to correctly adhere to Vanilla behavior.
This commit is contained in:
Spottedleaf
2024-07-14 12:56:30 -07:00
parent 1f0ca522c7
commit 225d5f937d
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java
View File

@@ -16,6 +16,7 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.border.WorldBorder;
import net.minecraft.world.level.chunk.ChunkSource;
import net.minecraft.world.level.chunk.LevelChunk;
import net.minecraft.world.level.chunk.LevelChunkSection;
@@ -48,6 +49,8 @@ public abstract class LevelMixin implements CollisionLevel, LevelAccessor, AutoC
@Shadow
public abstract LevelChunk getChunk(int x, int z);
@Shadow
public abstract WorldBorder getWorldBorder();
@Unique
@@ -330,6 +333,16 @@ public abstract class LevelMixin implements CollisionLevel, LevelAccessor, AutoC
null
);
final WorldBorder worldBorder = this.getWorldBorder();
if (worldBorder != null) {
aabbs.removeIf((final AABB aabb) -> {
return !worldBorder.isWithinBounds(aabb);
});
voxels.removeIf((final VoxelShape shape) -> {
return !worldBorder.isWithinBounds(shape.bounds());
});
}
// push voxels into aabbs
for (int i = 0, len = voxels.size(); i < len; ++i) {
aabbs.addAll(voxels.get(i).toAabbs());