upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 03:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ScriptWorld:

Browse Source 
-Made offset parameter for rayCastEntities() have a use again
This commit is contained in:
Luis C.M committed 2023-06-01 21:29:29 -05:00
1 parent 414818ab8d
commit 0692c4362f
1 file changed
+5 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/noppes/npcs/scripted/ScriptWorld.java
+5 -2
View File
@@ -808,6 +808,7 @@ public class ScriptWorld implements IWorld {
boolean stopOnBlock, boolean stopOnLiquid, boolean stopOnCollision) {
Vec3 startVec = Vec3.createVectorHelper(startPos[0], startPos[1], startPos[2]);
Vec3 endVec = startVec.addVector(lookVector[0]*maxDistance,lookVector[1]*maxDistance,lookVector[2]*maxDistance);
startVec = startVec.addVector(lookVector[0]*offset, lookVector[1]*offset, lookVector[2]*offset);
Set<IEntity<?>> entities = this.rayCastEntities(startVec,endVec,range,stopOnBlock,stopOnLiquid,stopOnCollision);
return entities.toArray(new IEntity[0]);
@@ -830,7 +831,8 @@ public class ScriptWorld implements IWorld {
Block block = this.world.getBlock(l, i1, j1);
int k1 = this.world.getBlockMetadata(l, i1, j1);
Collections.addAll(entities, this.getEntitiesNear(l,i1,j1,range));
IEntity<?>[] surrounding = this.getEntitiesNear(l,i1,j1,range);
Collections.addAll(entities, surrounding);
if (block.canCollideCheck(k1, false))
{
@@ -1000,7 +1002,8 @@ public class ScriptWorld implements IWorld {
Block block1 = this.world.getBlock(l, i1, j1);
int l1 = this.world.getBlockMetadata(l, i1, j1);
Collections.addAll(entities, this.getEntitiesNear(l,i1,j1,range));
IEntity<?>[] surroundingEntities = this.getEntitiesNear(l,i1,j1,range);
Collections.addAll(entities, surroundingEntities);
MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(this.world, l, i1, j1, startVec, endVec);
if (movingobjectposition1 != null)