Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-28 19:29:07 +00:00
Code Issues Releases Activity

Start work on reintroducing old spigot/paper bugs

Browse Source
This commit is contained in:
Samsuik
2025-09-25 14:49:19 +01:00
parent 6e5f86e665
commit 2497291881
10 changed files with 79 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sakura-server/src/main/java/me/samsuik/sakura/configuration/local/LocalConfiguration.java
View File

@@ -98,7 +98,10 @@ public final class LocalConfiguration implements LocalConfigurationAccessor {
CachedLocalConfiguration cache = this.cachedConfiguration.get(sectionKey);
//noinspection ConstantValue
if (cache == null) {
final ConfigurationContainer container = this.getContainer(x, y, z);
ConfigurationContainer container = this.getContainer(x, y, z);
if (container == null) {
container = new ConfigurationContainer();
}
cache = new CachedLocalConfiguration(level, container, sectionKey);
this.cachedConfiguration.put(sectionKey, cache);
}

18
sakura-server/src/main/java/me/samsuik/sakura/mechanics/EntityBehaviour.java
View File

@@ -1,11 +1,16 @@
package me.samsuik.sakura.mechanics;
import ca.spottedleaf.moonrise.patches.collisions.CollisionUtil;
import net.minecraft.core.Direction;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;
import java.util.List;
@NullMarked
public final class EntityBehaviour {
public static void changeEntityPosition(
@@ -49,4 +54,17 @@ public final class EntityBehaviour {
? Math.abs(x) < Math.abs(z)
: mechanicsTarget.isLegacy() && Math.abs(x) > Math.abs(z);
}
public static void convertVoxelsIntoAABBs(final Vec3 movement, final AABB bb, final List<VoxelShape> voxels, final List<AABB> aabbs) {
final AABB collisions = bb.expandTowards(movement);
for (final VoxelShape shape : voxels) {
for (final AABB boundingBox : shape.toAabbs()) {
if (CollisionUtil.voxelShapeIntersect(boundingBox, collisions) && !CollisionUtil.isEmpty(boundingBox)) {
aabbs.add(boundingBox);
}
}
}
voxels.clear();
}
}