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

Possible fix, pt. 2

Browse Source
This commit is contained in:
fullwall 2013-02-19 10:32:33 +08:00
parent 1946c1a7db
commit 550dfbd6a2
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/citizensnpcs/npc/entity/EntityHumanNPC.java
View File

@ -16,9 +16,11 @@ import net.citizensnpcs.util.Util;
import net.minecraft.server.v1_4_R1.Connection;
import net.minecraft.server.v1_4_R1.EntityPlayer;
import net.minecraft.server.v1_4_R1.EnumGamemode;
import net.minecraft.server.v1_4_R1.MathHelper;
import net.minecraft.server.v1_4_R1.MinecraftServer;
import net.minecraft.server.v1_4_R1.Navigation;
import net.minecraft.server.v1_4_R1.NetworkManager;
import net.minecraft.server.v1_4_R1.Packet35EntityHeadRotation;
import net.minecraft.server.v1_4_R1.Packet5EntityEquipment;
import net.minecraft.server.v1_4_R1.PlayerInteractManager;
import net.minecraft.server.v1_4_R1.World;
@ -126,6 +128,8 @@ public class EntityHumanNPC extends EntityPlayer implements NPCHolder {
super.j_();
if (npc == null)
return;
int i = MathHelper.d(az * 256.0F / 360.0F);
NMS.sendToOnline(new Packet35EntityHeadRotation(id, (byte) i));
if (getBukkitEntity() != null && Util.isLoaded(getBukkitEntity().getLocation(LOADED_LOCATION))) {
if (!npc.getNavigator().isNavigating() && !NMS.inWater(getBukkitEntity()))
move(0, -0.2, 0);

5
src/main/java/net/citizensnpcs/util/NMS.java
View File

@ -24,7 +24,6 @@ import net.minecraft.server.v1_4_R1.MobEffectList;
import net.minecraft.server.v1_4_R1.Navigation;
import net.minecraft.server.v1_4_R1.NetworkManager;
import net.minecraft.server.v1_4_R1.Packet;
import net.minecraft.server.v1_4_R1.Packet35EntityHeadRotation;
import net.minecraft.server.v1_4_R1.PathfinderGoalSelector;
import net.minecraft.server.v1_4_R1.World;
@ -263,10 +262,6 @@ public class NMS {
}
handle.az = yaw;
handle.aA = yaw;
if (handle instanceof EntityPlayer) {
int i = MathHelper.d(yaw * 256.0F / 360.0F);
sendToOnline(new Packet35EntityHeadRotation(handle.id, (byte) i));
}
}
public static void setLandSpeedModifier(EntityLiving handle, float speed) {