Skip to content

Commit 8fde678

Browse files
authored
Merge pull request #3287 from WhereisFff/releases/1.21
Fixed Acceleration Ring entity‑position checks 修复加速环检测实体位置的逻辑
2 parents b1cf6a4 + 1b5bfed commit 8fde678

2 files changed

Lines changed: 2 additions & 6 deletions

File tree

src/main/java/dev/dubhe/anvilcraft/block/entity/AccelerationRingBlockEntity.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,7 @@ public void accelerate() {
198198
aabbStart = getBlockPos().relative(direction.getOpposite(), 2);
199199
}
200200
AABB aabb = AABB.encapsulatingFullBlocks(endRingPos.relative(direction), aabbStart);
201-
Direction.Axis axis = direction.getAxis();
202-
double inflationX = axis == Direction.Axis.X ? 0 : 1;
203-
double inflationY = axis == Direction.Axis.Y ? 0 : 1;
204-
double inflationZ = axis == Direction.Axis.Z ? 0 : 1;
205-
ACCELERATION_AABB_MAP.put(getBlockPos(), aabb.inflate(inflationX, inflationY, inflationZ));
201+
ACCELERATION_AABB_MAP.put(getBlockPos(), aabb);
206202
for (BlockPos pos : blockPoses) {
207203
BlockState fallState = this.level.getBlockState(pos);
208204
this.level.setBlock(pos, Blocks.AIR.defaultBlockState(), 2);

src/main/java/dev/dubhe/anvilcraft/util/AccelerateManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void handleAcceleration(Entity entity) {
2828
for (BlockPos pos : AccelerationRingBlockEntity.getAllBlocks(level)) {
2929
AABB aabb = AccelerationRingBlockEntity.getAABB(pos);
3030
if (aabb == null) continue;
31-
if (aabb.contains(entity.position())) {
31+
if (aabb.contains(entity.getBoundingBox().getCenter())) {
3232
BlockState state = level.getBlockState(pos);
3333
if (isActiveAccelerationRing(state)) {
3434
applyAcceleration(entity, pos, state.getValue(AccelerationRingBlock.FACING));

0 commit comments

Comments
 (0)