kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

排除obb entity自身影响

Browse source
This commit is contained in:
17146 2025-06-15 20:04:58 +08:00 • committed by Light_Quanta
parent 07f7710103
commit 3c3c0d0bda
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/com/atsuishio/superbwarfare/mixins/ProjectileUtilMixin.java
View file

@ -3,6 +3,7 @@ package com.atsuishio.superbwarfare.mixins;
import com.atsuishio.superbwarfare.entity.OBBEntity; import com.atsuishio.superbwarfare.entity.OBBEntity;
import com.atsuishio.superbwarfare.tools.OBB; import com.atsuishio.superbwarfare.tools.OBB;
import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.projectile.Projectile;
import net.minecraft.world.entity.projectile.ProjectileUtil; import net.minecraft.world.entity.projectile.ProjectileUtil;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.AABB;
@ -27,6 +28,10 @@ public class ProjectileUtilMixin {
for (var entity : pLevel.getEntities(pProjectile, pBoundingBox, pFilter)) { for (var entity : pLevel.getEntities(pProjectile, pBoundingBox, pFilter)) {
if (entity instanceof OBBEntity obbEntity) { if (entity instanceof OBBEntity obbEntity) {
if (pProjectile instanceof Projectile projectile &&
(projectile.getOwner() == entity || entity.getPassengers().contains(projectile.getOwner()))) {
continue;
}
OBB obb = obbEntity.getOBB().inflate(pInflationAmount * 2); OBB obb = obbEntity.getOBB().inflate(pInflationAmount * 2);
Optional<Vector3f> optional = obb.clip(pStartVec.toVector3f(), pEndVec.toVector3f()); Optional<Vector3f> optional = obb.clip(pStartVec.toVector3f(), pEndVec.toVector3f());