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

Controllable NPCs now have correct yaw

Browse Source
This commit is contained in:
fullwall 2013-04-13 15:49:17 +08:00
parent e75c167da3
commit 623430451f
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/net/citizensnpcs/trait/Controllable.java
View File

@ -11,7 +11,9 @@ import net.citizensnpcs.api.persistence.Persist;
import net.citizensnpcs.api.trait.Trait; import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.api.trait.trait.Owner; import net.citizensnpcs.api.trait.trait.Owner;
import net.citizensnpcs.api.util.DataKey; import net.citizensnpcs.api.util.DataKey;
import net.citizensnpcs.util.NMS;
import net.citizensnpcs.util.Util; import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_5_R2.EntityEnderDragon;
import net.minecraft.server.v1_5_R2.EntityLiving; import net.minecraft.server.v1_5_R2.EntityLiving;
import net.minecraft.server.v1_5_R2.EntityPlayer; import net.minecraft.server.v1_5_R2.EntityPlayer;
@ -167,6 +169,19 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
key.setString("explicittype", explicitType.name()); key.setString("explicittype", explicitType.name());
} }
private void setMountedYaw(EntityLiving handle) {
if (handle instanceof EntityEnderDragon)
return; // EnderDragon handles this separately
double tX = handle.locX + handle.motX;
double tZ = handle.locZ + handle.motZ;
if (handle.locZ > tZ) {
handle.yaw = (float) -Math.toDegrees(Math.atan((handle.locX - tX) / (handle.locZ - tZ))) + 180F;
} else if (handle.locZ < tZ) {
handle.yaw = (float) -Math.toDegrees(Math.atan((handle.locX - tX) / (handle.locZ - tZ)));
}
NMS.setHeadYaw(handle, handle.yaw);
}
@Override @Override
public boolean toggle() { public boolean toggle() {
enabled = !enabled; enabled = !enabled;
@ -205,6 +220,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
handle.motX = dir.getX(); handle.motX = dir.getX();
handle.motY = dir.getY(); handle.motY = dir.getY();
handle.motZ = dir.getZ(); handle.motZ = dir.getZ();
setMountedYaw(handle);
} }
} }
@ -238,6 +254,7 @@ public class Controllable extends Trait implements Toggleable, CommandConfigurab
.modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED)); .modifiedSpeed((onGround ? GROUND_SPEED : AIR_SPEED));
handle.motX += handle.passenger.motX * speedMod; handle.motX += handle.passenger.motX * speedMod;
handle.motZ += handle.passenger.motZ * speedMod; handle.motZ += handle.passenger.motZ * speedMod;
setMountedYaw(handle);
} }
private static final float AIR_SPEED = 1.5F; private static final float AIR_SPEED = 1.5F;

1
src/main/java/net/citizensnpcs/trait/LookClose.java
View File

@ -22,7 +22,6 @@ public class LookClose extends Trait implements Toggleable, CommandConfigurable
private boolean enabled = Setting.DEFAULT_LOOK_CLOSE.asBoolean(); private boolean enabled = Setting.DEFAULT_LOOK_CLOSE.asBoolean();
private Player lookingAt; private Player lookingAt;
private double range = Setting.DEFAULT_LOOK_CLOSE_RANGE.asDouble(); private double range = Setting.DEFAULT_LOOK_CLOSE_RANGE.asDouble();
private boolean realisticLooking = Setting.DEFAULT_REALISTIC_LOOKING.asBoolean(); private boolean realisticLooking = Setting.DEFAULT_REALISTIC_LOOKING.asBoolean();
public LookClose() { public LookClose() {