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

Player NPC swimming

Browse Source
This commit is contained in:
fullwall 2012-10-26 16:35:23 +08:00
parent 0ba4270a40
commit 3ff0b651c1
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/citizensnpcs/npc/entity/CitizensHumanNPC.java
View File

@ -139,9 +139,9 @@ public class CitizensHumanNPC extends CitizensNPC implements Equipable {
super.update(); super.update();
if (isSpawned() && getBukkitEntity().getLocation().getChunk().isLoaded()) { if (isSpawned() && getBukkitEntity().getLocation().getChunk().isLoaded()) {
mcEntity.move(0, -0.2, 0); mcEntity.move(0, -0.2, 0);
NMS.trySwim(getHandle());
// gravity! also works around an entity.onGround not updating issue // gravity! also works around an entity.onGround not updating issue
// (onGround is normally updated by the client) // (onGround is normally updated by the client)
NMS.trySwim(mcEntity, 0.16F);
} }
} }
} }

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

@ -204,8 +204,13 @@ public class NMS {
} }
public static void trySwim(EntityLiving handle) { public static void trySwim(EntityLiving handle) {
if ((handle.H() || handle.J()) && Math.random() < 0.8F) trySwim(handle, 0.04F);
handle.motY += 0.04; }
public static void trySwim(EntityLiving handle, float power) {
if ((handle.I() || handle.J()) && Math.random() < 0.8F) {
handle.motY += power;
}
} }
public static void updateAI(EntityLiving entity) { public static void updateAI(EntityLiving entity) {