Repo-Mirror/craft-engine
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/craft-engine.git synced 2025-12-20 07:29:17 +00:00
Code Issues Releases Activity

再次优化下座椅

Browse Source
This commit is contained in:
XiaoMoMi
2025-11-02 00:24:53 +08:00
parent f09c575c4b
commit 60aae20da7
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bukkit/src/main/java/net/momirealms/craftengine/bukkit/entity/seat/BukkitSeatManager.java
View File

@@ -112,6 +112,11 @@ public class BukkitSeatManager implements SeatManager {
boolean isSeat = seat.getPersistentDataContainer().has(SEAT_KEY); boolean isSeat = seat.getPersistentDataContainer().has(SEAT_KEY);
if (!isSeat) return; if (!isSeat) return;
Location location = seat.getLocation(); Location location = seat.getLocation();
if (seat instanceof ArmorStand) {
location.add(0, 0.9875,0);
} else {
location.add(0,0.25,0);
}
seat.remove(); seat.remove();
EntityUtils.safeDismount(player, location); EntityUtils.safeDismount(player, location);
} }

2
bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/behavior/FurnitureItemBehavior.java
View File

@@ -113,7 +113,7 @@ public class FurnitureItemBehavior extends ItemBehavior {
hitBoxConfig.initShapeForPlacement(finalPlacePosition.x(), finalPlacePosition.y(), finalPlacePosition.z(), (float) furnitureYaw, QuaternionUtils.toQuaternionf(0, Math.toRadians(180 - furnitureYaw), 0).conjugate(), aabbs::add); hitBoxConfig.initShapeForPlacement(finalPlacePosition.x(), finalPlacePosition.y(), finalPlacePosition.z(), (float) furnitureYaw, QuaternionUtils.toQuaternionf(0, Math.toRadians(180 - furnitureYaw), 0).conjugate(), aabbs::add);
} }
if (!aabbs.isEmpty()) { if (!aabbs.isEmpty()) {
if (!FastNMS.INSTANCE.checkEntityCollision(context.getLevel().serverWorld(), aabbs.stream().map(it -> FastNMS.INSTANCE.constructor$AABB(it.minX, it.minY, it.minZ, it.maxX, it.maxY, it.maxZ)).toList(), finalPlacePosition.x(), finalPlacePosition.y(), finalPlacePosition.z())) { if (!FastNMS.INSTANCE.checkEntityCollision(context.getLevel().serverWorld(), aabbs.stream().map(it -> FastNMS.INSTANCE.constructor$AABB(it.minX, it.minY, it.minZ, it.maxX, it.maxY, it.maxZ)).toList())) {
return InteractionResult.FAIL; return InteractionResult.FAIL;
} }
} }

40
bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/EntityUtils.java
View File

@@ -4,6 +4,7 @@ import net.momirealms.craftengine.bukkit.api.BukkitAdaptors;
import net.momirealms.craftengine.bukkit.nms.FastNMS; import net.momirealms.craftengine.bukkit.nms.FastNMS;
import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections; import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.CoreReflections;
import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.MBuiltInRegistries; import net.momirealms.craftengine.bukkit.plugin.reflection.minecraft.MBuiltInRegistries;
import net.momirealms.craftengine.core.entity.player.InteractionResult;
import net.momirealms.craftengine.core.util.Key; import net.momirealms.craftengine.core.util.Key;
import net.momirealms.craftengine.core.util.MiscUtils; import net.momirealms.craftengine.core.util.MiscUtils;
import net.momirealms.craftengine.core.util.VersionHelper; import net.momirealms.craftengine.core.util.VersionHelper;
@@ -55,7 +56,7 @@ public final class EntityUtils {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
Vec3d direction = getHorizontalDirection(i * 0.25, boundBoxWidth, player.getYaw()); Vec3d direction = getHorizontalDirection(i * 0.25, boundBoxWidth, player.getYaw());
double x = location.getX() + direction.x; double x = location.getX() + direction.x;
double y = location.getY() + 0.75; double y = location.getY();
double z = location.getZ() + direction.z; double z = location.getZ() + direction.z;
Object serverLevel = BukkitAdaptors.adapt(player.getWorld()).serverWorld(); Object serverLevel = BukkitAdaptors.adapt(player.getWorld()).serverWorld();
Object serverPlayer = FastNMS.INSTANCE.method$CraftPlayer$getHandle(player); Object serverPlayer = FastNMS.INSTANCE.method$CraftPlayer$getHandle(player);
@@ -63,26 +64,31 @@ public final class EntityUtils {
BlockPos pos = new BlockPos(MiscUtils.fastFloor(x), MiscUtils.fastFloor(y), MiscUtils.fastFloor(z)); BlockPos pos = new BlockPos(MiscUtils.fastFloor(x), MiscUtils.fastFloor(y), MiscUtils.fastFloor(z));
try { try {
double floorHeight = (double) CoreReflections.method$BlockGetter$getBlockFloorHeight.invoke(serverLevel, LocationUtils.toBlockPos(pos)); double floorHeight = (double) CoreReflections.method$BlockGetter$getBlockFloorHeight.invoke(serverLevel, LocationUtils.toBlockPos(pos));
if (pos.y() + floorHeight > y) { if (pos.y() + floorHeight > y + 0.75) {
continue; continue;
} }
if (isBlockFloorValid(floorHeight)) { if (isBlockFloorValid(floorHeight)) {
Object aabb = CoreReflections.method$LivingEntity$getLocalBoundsForPose.invoke(serverPlayer, pose);
Object vec3 = FastNMS.INSTANCE.constructor$Vec3(x, pos.y() + floorHeight, z); Object vec3 = FastNMS.INSTANCE.constructor$Vec3(x, pos.y() + floorHeight, z);
boolean canDismount = (boolean) CoreReflections.method$DismountHelper$canDismountTo1.invoke(null, serverLevel, vec3, serverPlayer, pose); Object newAABB = FastNMS.INSTANCE.method$AABB$move(aabb, vec3);
if (canDismount) { boolean canDismount = (boolean) CoreReflections.method$DismountHelper$canDismountTo0.invoke(null, serverLevel, serverPlayer, newAABB);
if (VersionHelper.isFolia()) { if (!canDismount) {
player.teleportAsync(new Location(player.getWorld(), x, pos.y() + floorHeight, z, player.getYaw(), player.getPitch())); continue;
} else { }
player.teleport(new Location(player.getWorld(), x, pos.y() + floorHeight, z, player.getYaw(), player.getPitch())); if (!FastNMS.INSTANCE.checkEntityCollision(serverLevel, List.of(newAABB))) {
} continue;
if (pose == CoreReflections.instance$Pose$STANDING) { }
player.setPose(Pose.STANDING); if (VersionHelper.isFolia()) {
} else if (pose == CoreReflections.instance$Pose$CROUCHING) { player.teleportAsync(new Location(player.getWorld(), x, pos.y() + floorHeight, z, player.getYaw(), player.getPitch()));
player.setPose(Pose.SNEAKING); } else {
} else if (pose == CoreReflections.instance$Pose$SWIMMING) { player.teleport(new Location(player.getWorld(), x, pos.y() + floorHeight, z, player.getYaw(), player.getPitch()));
player.setPose(Pose.SWIMMING); }
} if (pose == CoreReflections.instance$Pose$STANDING) {
return; player.setPose(Pose.STANDING);
} else if (pose == CoreReflections.instance$Pose$CROUCHING) {
player.setPose(Pose.SNEAKING);
} else if (pose == CoreReflections.instance$Pose$SWIMMING) {
player.setPose(Pose.SWIMMING);
} }
} }
} catch (ReflectiveOperationException e) { } catch (ReflectiveOperationException e) {

2
gradle.properties
View File

@@ -49,7 +49,7 @@ byte_buddy_version=1.17.8
ahocorasick_version=0.6.3 ahocorasick_version=0.6.3
snake_yaml_version=2.5 snake_yaml_version=2.5
anti_grief_version=1.0.4 anti_grief_version=1.0.4
nms_helper_version=1.0.121 nms_helper_version=1.0.123
evalex_version=3.5.0 evalex_version=3.5.0
reactive_streams_version=1.0.4 reactive_streams_version=1.0.4
amazon_awssdk_version=2.34.5 amazon_awssdk_version=2.34.5