Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-14 12:11:30 +01:00
Code Issues Projects Releases Wiki Activity

Try rename

Browse Source
This commit is contained in:
fullwall 2023-01-02 18:00:52 +08:00
parent 6165f4cb12
commit 26bf39c328
3 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinder.java
View File

@ -26,18 +26,18 @@ public class PlayerPathfinder extends Pathfinder {
public PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, public PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient,
BlockPosition paramBlockPosition, float paramFloat) { BlockPosition paramBlockPosition, float paramFloat) {
return a(paramIBlockAccess, paramEntityInsentient, paramBlockPosition.getX() + 0.5F, return pa(paramIBlockAccess, paramEntityInsentient, paramBlockPosition.getX() + 0.5F,
paramBlockPosition.getY() + 0.5F, paramBlockPosition.getZ() + 0.5F, paramFloat); paramBlockPosition.getY() + 0.5F, paramBlockPosition.getZ() + 0.5F, paramFloat);
} }
private PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, double paramDouble1, private PathEntity pa(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, double paramDouble1,
double paramDouble2, double paramDouble3, float paramFloat) { double paramDouble2, double paramDouble3, float paramFloat) {
this.a.a(); this.a.a();
this.d.a(paramIBlockAccess, paramEntityInsentient); this.d.a(paramIBlockAccess, paramEntityInsentient);
PathPoint localPathPoint1 = this.d.b(); PathPoint localPathPoint1 = this.d.b();
PathPoint localPathPoint2 = this.d.a(paramDouble1, paramDouble2, paramDouble3); PathPoint localPathPoint2 = this.d.a(paramDouble1, paramDouble2, paramDouble3);
PathEntity localPathEntity = a(localPathPoint1, localPathPoint2, paramFloat); PathEntity localPathEntity = pa(localPathPoint1, localPathPoint2, paramFloat);
this.d.a(); this.d.a();
return localPathEntity; return localPathEntity;
@ -45,11 +45,11 @@ public class PlayerPathfinder extends Pathfinder {
public PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, Entity paramEntity, public PathEntity a(IBlockAccess paramIBlockAccess, EntityHumanNPC paramEntityInsentient, Entity paramEntity,
float paramFloat) { float paramFloat) {
return a(paramIBlockAccess, paramEntityInsentient, paramEntity.locX, paramEntity.getBoundingBox().b, return pa(paramIBlockAccess, paramEntityInsentient, paramEntity.locX, paramEntity.getBoundingBox().b,
paramEntity.locZ, paramFloat); paramEntity.locZ, paramFloat);
} }
private PathEntity a(PathPoint paramPathPoint1, PathPoint paramPathPoint2) { private PathEntity pa(PathPoint paramPathPoint1, PathPoint paramPathPoint2) {
int i = 1; int i = 1;
PathPoint localPathPoint = paramPathPoint2; PathPoint localPathPoint = paramPathPoint2;
while (localPathPoint.h != null) { while (localPathPoint.h != null) {
@ -66,7 +66,7 @@ public class PlayerPathfinder extends Pathfinder {
return new PathEntity(arrayOfPathPoint); return new PathEntity(arrayOfPathPoint);
} }
private PathEntity a(PathPoint paramPathPoint1, PathPoint paramPathPoint2, float paramFloat) { private PathEntity pa(PathPoint paramPathPoint1, PathPoint paramPathPoint2, float paramFloat) {
paramPathPoint1.e = 0.0F; paramPathPoint1.e = 0.0F;
paramPathPoint1.f = paramPathPoint1.c(paramPathPoint2); paramPathPoint1.f = paramPathPoint1.c(paramPathPoint2);
paramPathPoint1.g = paramPathPoint1.f; paramPathPoint1.g = paramPathPoint1.f;
@ -117,7 +117,7 @@ public class PlayerPathfinder extends Pathfinder {
if (localObject1 == paramPathPoint1) { if (localObject1 == paramPathPoint1) {
return null; return null;
} }
Object localObject2 = a(paramPathPoint1, (PathPoint) localObject1); Object localObject2 = pa(paramPathPoint1, (PathPoint) localObject1);
return (PathEntity) localObject2; return (PathEntity) localObject2;
} }

6
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderAbstract.java
View File

@ -18,12 +18,6 @@ public abstract class PlayerPathfinderAbstract extends PathfinderAbstract {
protected boolean h; protected boolean h;
protected boolean i; protected boolean i;
@Override
public void a() {
this.a = null;
this.b = null;
}
@Override @Override
public void a(boolean paramBoolean) { public void a(boolean paramBoolean) {
this.g = paramBoolean; this.g = paramBoolean;

47
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerPathfinderNormal.java
View File

@ -32,7 +32,8 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
@Override @Override
public void a() { public void a() {
this.b.a(PathType.WATER, this.j); this.b.a(PathType.WATER, this.j);
super.a(); this.a = null;
this.b = null;
} }
@Override @Override
@ -40,12 +41,12 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
return a(MathHelper.floor(paramDouble1), MathHelper.floor(paramDouble2), MathHelper.floor(paramDouble3)); return a(MathHelper.floor(paramDouble1), MathHelper.floor(paramDouble2), MathHelper.floor(paramDouble3));
} }
private PathType a(EntityHumanNPC paramEntityInsentient, BlockPosition paramBlockPosition) { private PathType pa(EntityHumanNPC paramEntityInsentient, BlockPosition paramBlockPosition) {
return a(paramEntityInsentient, paramBlockPosition.getX(), paramBlockPosition.getY(), return pa(paramEntityInsentient, paramBlockPosition.getX(), paramBlockPosition.getY(),
paramBlockPosition.getZ()); paramBlockPosition.getZ());
} }
private PathType a(EntityHumanNPC paramEntityInsentient, int paramInt1, int paramInt2, int paramInt3) { private PathType pa(EntityHumanNPC paramEntityInsentient, int paramInt1, int paramInt2, int paramInt3) {
return a(this.a, paramInt1, paramInt2, paramInt3, paramEntityInsentient, this.d, this.e, this.f, d(), c()); return a(this.a, paramInt1, paramInt2, paramInt3, paramEntityInsentient, this.d, this.e, this.f, d(), c());
} }
@ -57,11 +58,11 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
@Override @Override
public PathType a(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) { public PathType a(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) {
PathType localPathType1 = b(paramIBlockAccess, paramInt1, paramInt2, paramInt3); PathType localPathType1 = pb(paramIBlockAccess, paramInt1, paramInt2, paramInt3);
if ((localPathType1 == PathType.OPEN) && (paramInt2 >= 1)) { if ((localPathType1 == PathType.OPEN) && (paramInt2 >= 1)) {
Block localBlock = paramIBlockAccess.getType(new BlockPosition(paramInt1, paramInt2 - 1, paramInt3)) Block localBlock = paramIBlockAccess.getType(new BlockPosition(paramInt1, paramInt2 - 1, paramInt3))
.getBlock(); .getBlock();
PathType localPathType2 = b(paramIBlockAccess, paramInt1, paramInt2 - 1, paramInt3); PathType localPathType2 = pb(paramIBlockAccess, paramInt1, paramInt2 - 1, paramInt3);
localPathType1 = (localPathType2 == PathType.WALKABLE) || (localPathType2 == PathType.OPEN) localPathType1 = (localPathType2 == PathType.WALKABLE) || (localPathType2 == PathType.OPEN)
|| (localPathType2 == PathType.WATER) || (localPathType2 == PathType.LAVA) ? PathType.OPEN || (localPathType2 == PathType.WATER) || (localPathType2 == PathType.LAVA) ? PathType.OPEN
: PathType.WALKABLE; : PathType.WALKABLE;
@ -191,7 +192,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
return paramPathType; return paramPathType;
} }
private PathPoint a(int paramInt1, int paramInt2, int paramInt3, int paramInt4, double paramDouble, private PathPoint pa(int paramInt1, int paramInt2, int paramInt3, int paramInt4, double paramDouble,
EnumDirection paramEnumDirection) { EnumDirection paramEnumDirection) {
PathPoint localPathPoint = null; PathPoint localPathPoint = null;
@ -201,7 +202,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
if (d1 - paramDouble > 1.125D) { if (d1 - paramDouble > 1.125D) {
return null; return null;
} }
PathType localPathType1 = a(this.b, paramInt1, paramInt2, paramInt3); PathType localPathType1 = pa(this.b, paramInt1, paramInt2, paramInt3);
float f = this.b.a(localPathType1); float f = this.b.a(localPathType1);
double d2 = this.b.width / 2.0D; double d2 = this.b.width / 2.0D;
@ -215,7 +216,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
} }
if ((localPathPoint == null) && (paramInt4 > 0) && (localPathType1 != PathType.FENCE) if ((localPathPoint == null) && (paramInt4 > 0) && (localPathType1 != PathType.FENCE)
&& (localPathType1 != PathType.TRAPDOOR)) { && (localPathType1 != PathType.TRAPDOOR)) {
localPathPoint = a(paramInt1, paramInt2 + 1, paramInt3, paramInt4 - 1, paramDouble, paramEnumDirection); localPathPoint = pa(paramInt1, paramInt2 + 1, paramInt3, paramInt4 - 1, paramDouble, paramEnumDirection);
if ((localPathPoint != null) if ((localPathPoint != null)
&& ((localPathPoint.m == PathType.OPEN) || (localPathPoint.m == PathType.WALKABLE)) && ((localPathPoint.m == PathType.OPEN) || (localPathPoint.m == PathType.WALKABLE))
&& (this.b.width < 1.0F)) { && (this.b.width < 1.0F)) {
@ -239,7 +240,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
return null; return null;
} }
if (this.b.width >= 1.0F) { if (this.b.width >= 1.0F) {
PathType localPathType2 = a(this.b, paramInt1, paramInt2 - 1, paramInt3); PathType localPathType2 = pa(this.b, paramInt1, paramInt2 - 1, paramInt3);
if (localPathType2 == PathType.BLOCKED) { if (localPathType2 == PathType.BLOCKED) {
localPathPoint = a(paramInt1, paramInt2, paramInt3); localPathPoint = a(paramInt1, paramInt2, paramInt3);
localPathPoint.m = PathType.WALKABLE; localPathPoint.m = PathType.WALKABLE;
@ -253,7 +254,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
if (i++ >= Setting.MC_NAVIGATION_MAX_FALL_DISTANCE.asInt()) { if (i++ >= Setting.MC_NAVIGATION_MAX_FALL_DISTANCE.asInt()) {
return null; return null;
} }
localPathType1 = a(this.b, paramInt1, paramInt2, paramInt3); localPathType1 = pa(this.b, paramInt1, paramInt2, paramInt3);
f = this.b.a(localPathType1); f = this.b.a(localPathType1);
if ((localPathType1 != PathType.OPEN) && (f >= 0.0F)) { if ((localPathType1 != PathType.OPEN) && (f >= 0.0F)) {
localPathPoint = a(paramInt1, paramInt2, paramInt3); localPathPoint = a(paramInt1, paramInt2, paramInt3);
@ -273,7 +274,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
int i = 0; int i = 0;
int k = 0; int k = 0;
PathType localPathType = a(this.b, paramPathPoint1.a, paramPathPoint1.b + 1, paramPathPoint1.c); PathType localPathType = pa(this.b, paramPathPoint1.a, paramPathPoint1.b + 1, paramPathPoint1.c);
if (this.b.a(localPathType) >= 0.0F) { if (this.b.a(localPathType) >= 0.0F) {
k = MathHelper.d(Math.max(1.0F, this.b.P)); k = MathHelper.d(Math.max(1.0F, this.b.P));
} }
@ -281,13 +282,13 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
.down(); .down();
double d = paramPathPoint1.b - (1.0D - this.a.getType(localBlockPosition).e(this.a, localBlockPosition).e); double d = paramPathPoint1.b - (1.0D - this.a.getType(localBlockPosition).e(this.a, localBlockPosition).e);
PathPoint localPathPoint1 = a(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c + 1, k, d, PathPoint localPathPoint1 = pa(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
EnumDirection.SOUTH); EnumDirection.SOUTH);
PathPoint localPathPoint2 = a(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c, k, d, PathPoint localPathPoint2 = pa(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c, k, d,
EnumDirection.WEST); EnumDirection.WEST);
PathPoint localPathPoint3 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c, k, d, PathPoint localPathPoint3 = pa(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c, k, d,
EnumDirection.EAST); EnumDirection.EAST);
PathPoint localPathPoint4 = a(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c - 1, k, d, PathPoint localPathPoint4 = pa(paramPathPoint1.a, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
EnumDirection.NORTH); EnumDirection.NORTH);
if ((localPathPoint1 != null) && (!localPathPoint1.i) && (localPathPoint1.a(paramPathPoint2) < paramFloat)) { if ((localPathPoint1 != null) && (!localPathPoint1.i) && (localPathPoint1.a(paramPathPoint2) < paramFloat)) {
paramArrayOfPathPoint[(i++)] = localPathPoint1; paramArrayOfPathPoint[(i++)] = localPathPoint1;
@ -311,7 +312,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
: 0; : 0;
PathPoint localPathPoint5; PathPoint localPathPoint5;
if ((m != 0) && (i2 != 0)) { if ((m != 0) && (i2 != 0)) {
localPathPoint5 = a(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d, localPathPoint5 = pa(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
EnumDirection.NORTH); EnumDirection.NORTH);
if ((localPathPoint5 != null) && (!localPathPoint5.i) if ((localPathPoint5 != null) && (!localPathPoint5.i)
&& (localPathPoint5.a(paramPathPoint2) < paramFloat)) { && (localPathPoint5.a(paramPathPoint2) < paramFloat)) {
@ -319,7 +320,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
} }
} }
if ((m != 0) && (i1 != 0)) { if ((m != 0) && (i1 != 0)) {
localPathPoint5 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d, localPathPoint5 = pa(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c - 1, k, d,
EnumDirection.NORTH); EnumDirection.NORTH);
if ((localPathPoint5 != null) && (!localPathPoint5.i) if ((localPathPoint5 != null) && (!localPathPoint5.i)
&& (localPathPoint5.a(paramPathPoint2) < paramFloat)) { && (localPathPoint5.a(paramPathPoint2) < paramFloat)) {
@ -327,7 +328,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
} }
} }
if ((n != 0) && (i2 != 0)) { if ((n != 0) && (i2 != 0)) {
localPathPoint5 = a(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d, localPathPoint5 = pa(paramPathPoint1.a - 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
EnumDirection.SOUTH); EnumDirection.SOUTH);
if ((localPathPoint5 != null) && (!localPathPoint5.i) if ((localPathPoint5 != null) && (!localPathPoint5.i)
&& (localPathPoint5.a(paramPathPoint2) < paramFloat)) { && (localPathPoint5.a(paramPathPoint2) < paramFloat)) {
@ -335,7 +336,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
} }
} }
if ((n != 0) && (i1 != 0)) { if ((n != 0) && (i1 != 0)) {
localPathPoint5 = a(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d, localPathPoint5 = pa(paramPathPoint1.a + 1, paramPathPoint1.b, paramPathPoint1.c + 1, k, d,
EnumDirection.SOUTH); EnumDirection.SOUTH);
if ((localPathPoint5 != null) && (!localPathPoint5.i) if ((localPathPoint5 != null) && (!localPathPoint5.i)
&& (localPathPoint5.a(paramPathPoint2) < paramFloat)) { && (localPathPoint5.a(paramPathPoint2) < paramFloat)) {
@ -372,7 +373,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
i = localObject1.up().getY(); i = localObject1.up().getY();
} }
localObject1 = new BlockPosition(this.b); localObject1 = new BlockPosition(this.b);
Object localObject2 = a(this.b, localObject1.getX(), i, localObject1.getZ()); Object localObject2 = pa(this.b, localObject1.getX(), i, localObject1.getZ());
if (this.b.a((PathType) localObject2) < 0.0F) { if (this.b.a((PathType) localObject2) < 0.0F) {
HashSet<BlockPosition> localHashSet = Sets.newHashSet(); HashSet<BlockPosition> localHashSet = Sets.newHashSet();
localHashSet.add(new BlockPosition(this.b.getBoundingBox().a, i, this.b.getBoundingBox().c)); localHashSet.add(new BlockPosition(this.b.getBoundingBox().a, i, this.b.getBoundingBox().c));
@ -380,7 +381,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().c)); localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().c));
localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().f)); localHashSet.add(new BlockPosition(this.b.getBoundingBox().d, i, this.b.getBoundingBox().f));
for (BlockPosition localBlockPosition : localHashSet) { for (BlockPosition localBlockPosition : localHashSet) {
PathType localPathType = a(this.b, localBlockPosition); PathType localPathType = pa(this.b, localBlockPosition);
if (this.b.a(localPathType) >= 0.0F) { if (this.b.a(localPathType) >= 0.0F) {
return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ()); return a(localBlockPosition.getX(), localBlockPosition.getY(), localBlockPosition.getZ());
} }
@ -389,7 +390,7 @@ public class PlayerPathfinderNormal extends PlayerPathfinderAbstract {
return a(localObject1.getX(), i, localObject1.getZ()); return a(localObject1.getX(), i, localObject1.getZ());
} }
protected PathType b(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) { protected PathType pb(IBlockAccess paramIBlockAccess, int paramInt1, int paramInt2, int paramInt3) {
BlockPosition localBlockPosition = new BlockPosition(paramInt1, paramInt2, paramInt3); BlockPosition localBlockPosition = new BlockPosition(paramInt1, paramInt2, paramInt3);
IBlockData localIBlockData = paramIBlockAccess.getType(localBlockPosition); IBlockData localIBlockData = paramIBlockAccess.getType(localBlockPosition);
Block localBlock = localIBlockData.getBlock(); Block localBlock = localIBlockData.getBlock();