Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-04-04 03:05:54 +02:00
Code Issues Projects Releases Wiki Activity

Change how npc looking works

Browse Source
This commit is contained in:
fullwall 2020-04-25 16:57:31 +08:00
parent f9b0397cab
commit fe8eb4e85d
9 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
main/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
View File

@ -228,7 +228,6 @@ public class CitizensNPC extends AbstractNPC {
return false;
}
data().get(NPC.DEFAULT_PROTECTED_METADATA, true);
at = at.clone();
if (reason == SpawnReason.CHUNK_LOAD || reason == SpawnReason.COMMAND) {

12
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerControllerLook.java
View File

@ -42,7 +42,7 @@ public class PlayerControllerLook {
this.a.aQ += 360F;
}
} else {
this.a.yaw = this.a.aQ + 40;
this.a.yaw = b(this.a.yaw, this.a.aK, -40F);
// this.a.aQ = a(this.a.aQ, this.a.aO, 10.0F);
}
float f3 = MathHelper.g(this.a.aQ - this.a.aO);
@ -101,6 +101,16 @@ public class PlayerControllerLook {
return this.d;
}
public float b(float var0, float var1, float var2) {
float var3 = c(var0, var1);
float var4 = MathHelper.a(var3, -var2, var2);
return var1 - var4;
}
public float c(float var0, float var1) {
return MathHelper.g(var1 - var0);
}
public double e() {
return this.e;
}

12
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerControllerLook.java
View File

@ -42,7 +42,7 @@ public class PlayerControllerLook {
this.a.aP += 360F;
}
} else {
this.a.yaw = this.a.aP + 40;
this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F);
// this.a.aP = a(this.a.aP, this.a.aN, 10.0F);
}
float f3 = MathHelper.g(this.a.aP - this.a.aN);
@ -101,6 +101,16 @@ public class PlayerControllerLook {
return this.d;
}
public float b(float var0, float var1, float var2) {
float var3 = c(var0, var1);
float var4 = MathHelper.a(var3, -var2, var2);
return var1 - var4;
}
public float c(float var0, float var1) {
return MathHelper.g(var1 - var0);
}
public double e() {
return this.e;
}

12
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerControllerLook.java
View File

@ -42,7 +42,7 @@ public class PlayerControllerLook {
this.a.aP += 360F;
}
} else {
this.a.yaw = this.a.aP + 40;
this.a.yaw = this.b(this.a.yaw, this.a.aP, -40F);
// this.a.aP = a(this.a.aP, this.a.aN, 10.0F);
}
float f3 = MathHelper.g(this.a.aP - this.a.aN);
@ -101,6 +101,16 @@ public class PlayerControllerLook {
return this.d;
}
public float b(float var0, float var1, float var2) {
float var3 = c(var0, var1);
float var4 = MathHelper.a(var3, -var2, var2);
return var1 - var4;
}
public float c(float var0, float var1) {
return MathHelper.g(var1 - var0);
}
public double e() {
return this.e;
}

12
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerControllerLook.java
View File

@ -43,7 +43,7 @@ public class PlayerControllerLook {
this.a.aS += 360F;
}
} else {
this.a.yaw = this.a.aS + 40;
this.a.yaw = b(this.a.yaw, this.a.aS, -40F);
// this.a.aP = a(this.a.aS, this.a.aQ, 10.0F);
}
float f3 = MathHelper.g(this.a.aS - this.a.aQ);
@ -103,6 +103,16 @@ public class PlayerControllerLook {
return this.d;
}
public float b(float var0, float var1, float var2) {
float var3 = c(var0, var1);
float var4 = MathHelper.a(var3, -var2, var2);
return var1 - var4;
}
public float c(float var0, float var1) {
return MathHelper.g(var1 - var0);
}
public double e() {
return this.e;
}

2
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerControllerLook.java
View File

@ -31,7 +31,7 @@ public class PlayerControllerLook {
this.a.yaw = this.a.aM;
this.a.pitch = this.a(this.a.pitch, this.g(), this.c);
} else {
this.a.yaw = this.a.aM + 40;
this.a.yaw = MathHelper.b(this.a.yaw, this.a.aM, -40F);
// this.a.aM = this.a(this.a.aM, this.a.aK, 10.0F);
}

1
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/EntityHumanNPC.java
View File

@ -77,6 +77,7 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder, Skinnable
private final CitizensNPC npc;
private final Location packetLocationCache = new Location(null, 0, 0, 0);
private final SkinPacketTracker skinTracker;
private int updateCounter = 0;
public EntityHumanNPC(MinecraftServer minecraftServer, WorldServer world, GameProfile gameProfile,

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerControllerLook.java
View File

@ -31,7 +31,7 @@ public class PlayerControllerLook {
this.a.yaw = this.a.aK;
this.a.pitch = this.a(this.a.pitch, this.g(), this.c);
} else {
this.a.yaw = this.a.aK + 40;
this.a.yaw = MathHelper.b(this.a.yaw, this.a.aK, -40F);
// this.a.aK = this.a(this.a.aK, this.a.aI, 10.0F);
}

12
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerControllerLook.java
View File

@ -43,7 +43,7 @@ public class PlayerControllerLook {
this.a.aK += 360F;
}
} else {
this.a.yaw = this.a.aK + 40;
this.a.yaw = b(this.a.yaw, this.a.aK, -40F);
// this.a.aK = a(this.a.aK, this.a.aI, 10.0F);
}
float f3 = MathHelper.g(this.a.aK - this.a.aI);
@ -102,6 +102,16 @@ public class PlayerControllerLook {
return this.d;
}
public float b(float var0, float var1, float var2) {
float var3 = c(var0, var1);
float var4 = MathHelper.a(var3, -var2, var2);
return var1 - var4;
}
public float c(float var0, float var1) {
return MathHelper.g(var1 - var0);
}
public double e() {
return this.e;
}