mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-20 06:29:41 +00:00
PathNavigateFlying:
-Fixed pathfinder running into lava & water when it shouldn't. FlyPathFinder: -Simplified nodeTypeToOffset switch statement, removed unused function, and made air always return an open path node type. EntityNPCInterface: -Fixed "In Air" drowning type. Breathes underwater now. EntityNPCFlying: -Fixed NPCs still using flight movement when not being able to breathe. ICustomNpc: -Added canBreathe() function
This commit is contained in:
1 parent
aa4b1dd9fb
commit
d86f571df6
6 files changed
+53
-37
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package noppes.npcs.ai.pathfinder;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
@@ -438,7 +439,7 @@ public class PathNavigateFlying extends PathNavigate {
|
||||
{
|
||||
Vec3 pos17 = Vec3.createVectorHelper(startPos.xCoord,startPos.yCoord, startPos.zCoord);
|
||||
Vec3 pos18 = Vec3.createVectorHelper(endPos.xCoord,endPos.yCoord, endPos.zCoord);
|
||||
if (this.rayTraceBlocks(pos17, pos18, false, false, false, width, height))
|
||||
if (this.rayTraceBlocks(pos17, pos18, true, false, false, width, height))
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@@ -656,15 +657,19 @@ public class PathNavigateFlying extends PathNavigate {
|
||||
Block block2 = this.worldObj.getBlock(l, i1, j1);
|
||||
int meta2 = this.worldObj.getBlockMetadata(l, i1, j1);
|
||||
|
||||
if (block2 != Blocks.air && (!p_147447_4_ || block2.getCollisionBoundingBoxFromPool(this.worldObj, l, i1, j1) != null)
|
||||
if ((!p_147447_4_ || block2.getCollisionBoundingBoxFromPool(this.worldObj, l, i1, j1) != null)
|
||||
&& block2.canCollideCheck(meta2, p_147447_3_)) {
|
||||
if (!block2.getBlocksMovement(this.worldObj, l, i1, j1)) {
|
||||
if (block2.getMaterial() == Material.lava && !this.theEntity.isImmuneToFire() ||
|
||||
block2.getMaterial() == Material.air && this.theEntity.stats.drowningType == 2 ||
|
||||
block2.getMaterial() == Material.water && this.theEntity.stats.drowningType == 1 ||
|
||||
!block2.getBlocksMovement(this.worldObj, l, i1, j1)) {
|
||||
value = true;
|
||||
l -= x;
|
||||
i1 -= y;
|
||||
j1 -= z;
|
||||
break;
|
||||
}
|
||||
|
||||
MovingObjectPosition movingobjectposition = block2.collisionRayTrace(this.worldObj, l, i1, j1, p_147447_1_, p_147447_2_);
|
||||
|
||||
if (movingobjectposition != null && movingobjectposition.typeOfHit != MovingObjectPosition.MovingObjectType.MISS) {
|
||||
|
||||
Reference in new issue
Block a user