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

Don't use Y velocity in boat movement

Browse Source
This commit is contained in:
fullwall 2024-08-25 02:39:31 +08:00
parent fbb6a48349
commit 79cf3f7bac
5 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/entity/nonliving/BoatController.java
View File

@ -175,7 +175,7 @@ public class BoatController extends MobEntityController {
baseTick(); baseTick();
if (getControllingPassenger() instanceof NPCHolder if (getControllingPassenger() instanceof NPCHolder
&& ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) { && ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) {
setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 1, 20)); setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 0, 20));
} }
npc.update(); npc.update();
if (getHurtTime() > 0) { if (getHurtTime() > 0) {

2
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/entity/nonliving/BoatController.java
View File

@ -183,7 +183,7 @@ public class BoatController extends MobEntityController {
baseTick(); baseTick();
if (getControllingPassenger() instanceof NPCHolder if (getControllingPassenger() instanceof NPCHolder
&& ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) { && ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) {
setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 1, 20)); setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 0, 20));
} }
npc.update(); npc.update();
if (getHurtTime() > 0) { if (getHurtTime() > 0) {

2
v1_20_R4/src/main/java/net/citizensnpcs/nms/v1_20_R4/entity/nonliving/BoatController.java
View File

@ -174,7 +174,7 @@ public class BoatController extends MobEntityController {
baseTick(); baseTick();
if (getControllingPassenger() instanceof NPCHolder if (getControllingPassenger() instanceof NPCHolder
&& ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) { && ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) {
setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 1, 20)); setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 0, 20));
} }
npc.update(); npc.update();
if (getHurtTime() > 0) { if (getHurtTime() > 0) {

1
v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/CodController.java
View File

@ -55,7 +55,6 @@ public class CodController extends MobEntityController {
public static class EntityCodNPC extends Cod implements NPCHolder { public static class EntityCodNPC extends Cod implements NPCHolder {
private final CitizensNPC npc; private final CitizensNPC npc;
private MoveControl oldMoveController; private MoveControl oldMoveController;
public EntityCodNPC(EntityType<? extends Cod> types, Level level) { public EntityCodNPC(EntityType<? extends Cod> types, Level level) {

2
v1_21_R1/src/main/java/net/citizensnpcs/nms/v1_21_R1/entity/nonliving/BoatController.java
View File

@ -246,7 +246,7 @@ public class BoatController extends MobEntityController {
baseTick(); baseTick();
if (getControllingPassenger() instanceof NPCHolder if (getControllingPassenger() instanceof NPCHolder
&& ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) { && ((NPCHolder) getControllingPassenger()).getNPC().getNavigator().isNavigating()) {
setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 1, 20)); setDeltaMovement(getControllingPassenger().getDeltaMovement().multiply(20, 0, 20));
} }
npc.update(); npc.update();
if (getHurtTime() > 0) { if (getHurtTime() > 0) {