Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Try to detect sneaking state onAttach for SneakTrait

This commit is contained in:
fullwall 2024-03-03 23:14:11 +08:00
parent b6f5184192
commit ed117eac96
13 changed files with 63 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/src/main/java/net/citizensnpcs/trait/SneakTrait.java
View File

@ -8,7 +8,7 @@ import net.citizensnpcs.util.NMS;
@TraitName("sneak")
public class SneakTrait extends Trait {
@Persist
private boolean sneaking = true;
private boolean sneaking;
public SneakTrait() {
super("sneak");
@ -24,6 +24,11 @@ public class SneakTrait extends Trait {
return sneaking;
}
@Override
public void onAttach() {
sneaking = NMS.isSneaking(npc.getEntity());
}
@Override
public void onSpawn() {
apply();

7
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -1318,13 +1318,6 @@ public class NMSImpl implements NMSBridge {
((EntityTameableAnimal) NMSImpl.getHandle((LivingEntity) tameable)).setSitting(sitting);
}
@Override
public void setSneaking(org.bukkit.entity.Entity entity, boolean sneaking) {
if (entity instanceof Player) {
((Player) entity).setSneaking(sneaking);
}
}
@Override
public void setStepHeight(org.bukkit.entity.Entity entity, float height) {
NMSImpl.getHandle(entity).P = height;

7
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View File

@ -1371,13 +1371,6 @@ public class NMSImpl implements NMSBridge {
((EntityTameableAnimal) NMSImpl.getHandle((LivingEntity) tameable)).setSitting(sitting);
}
@Override
public void setSneaking(org.bukkit.entity.Entity entity, boolean sneaking) {
if (entity instanceof Player) {
((Player) entity).setSneaking(sneaking);
}
}
@Override
public void setStepHeight(org.bukkit.entity.Entity entity, float height) {
NMSImpl.getHandle(entity).P = height;

7
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View File

@ -1378,13 +1378,6 @@ public class NMSImpl implements NMSBridge {
((EntityTameableAnimal) NMSImpl.getHandle((LivingEntity) tameable)).setSitting(sitting);
}
@Override
public void setSneaking(org.bukkit.entity.Entity entity, boolean sneaking) {
if (entity instanceof Player) {
((Player) entity).setSneaking(sneaking);
}
}
@Override
public void setStepHeight(org.bukkit.entity.Entity entity, float height) {
NMSImpl.getHandle(entity).P = height;

7
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
View File

@ -1415,13 +1415,6 @@ public class NMSImpl implements NMSBridge {
((EntityTameableAnimal) NMSImpl.getHandle((LivingEntity) tameable)).setSitting(sitting);
}
@Override
public void setSneaking(org.bukkit.entity.Entity entity, boolean sneaking) {
if (entity instanceof Player) {
((Player) entity).setSneaking(sneaking);
}
}
@Override
public void setStepHeight(org.bukkit.entity.Entity entity, float height) {
NMSImpl.getHandle(entity).Q = height;

8
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
View File

@ -836,6 +836,14 @@ public class NMSImpl implements NMSBridge {
return NMSImpl.getHandle(entity).onGround;
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == EntityPose.SNEAKING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
IBlockData data = ((CraftBlock) in).getNMS();

8
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
View File

@ -851,6 +851,14 @@ public class NMSImpl implements NMSBridge {
return NMSImpl.getHandle(entity).onGround;
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == EntityPose.CROUCHING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
IBlockData data = ((CraftBlock) in).getNMS();

8
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
View File

@ -875,6 +875,14 @@ public class NMSImpl implements NMSBridge {
return NMSImpl.getHandle(entity).isOnGround();
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == EntityPose.CROUCHING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
IBlockData data = ((CraftBlock) in).getNMS();

10
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View File

@ -657,7 +657,7 @@ public class NMSImpl implements NMSBridge {
entry.broadcastRemoved();
}
};
}
}
@Override
public List<org.bukkit.entity.Entity> getPassengers(org.bukkit.entity.Entity entity) {
@ -877,6 +877,14 @@ public class NMSImpl implements NMSBridge {
return NMSImpl.getHandle(entity).isOnGround();
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == Pose.CROUCHING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
BlockState data = ((CraftBlock) in).getNMS();

8
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
View File

@ -884,6 +884,14 @@ public class NMSImpl implements NMSBridge {
return NMSImpl.getHandle(entity).isOnGround();
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == Pose.CROUCHING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
BlockState data = ((CraftBlock) in).getNMS();

8
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
View File

@ -925,6 +925,14 @@ public class NMSImpl implements NMSBridge {
return getHandle(entity).isOnGround();
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == Pose.CROUCHING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
BlockState data = ((CraftBlock) in).getNMS();

8
v1_20_R3/src/main/java/net/citizensnpcs/nms/v1_20_R3/util/NMSImpl.java
View File

@ -895,6 +895,14 @@ public class NMSImpl implements NMSBridge {
return getHandle(entity).onGround();
}
@Override
public boolean isSneaking(org.bukkit.entity.Entity entity) {
if (entity instanceof Player) {
return ((Player) entity).isSneaking();
}
return getHandle(entity).getPose() == Pose.CROUCHING;
}
@Override
public boolean isSolid(org.bukkit.block.Block in) {
BlockState data = ((CraftBlock) in).getNMS();

7
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
View File

@ -1228,13 +1228,6 @@ public class NMSImpl implements NMSBridge {
((EntityTameableAnimal) NMSImpl.getHandle((LivingEntity) tameable)).setSitting(sitting);
}
@Override
public void setSneaking(org.bukkit.entity.Entity entity, boolean sneaking) {
if (entity instanceof Player) {
((Player) entity).setSneaking(sneaking);
}
}
@Override
public void setStepHeight(org.bukkit.entity.Entity entity, float height) {
NMSImpl.getHandle(entity).S = height;