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

Avoid errors with missing metadata

Browse Source
This commit is contained in:
fullwall 2021-01-20 17:55:34 +08:00
parent 8c0fa7cd17
commit 688ba3af8e
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/PlayerAnimationImpl.java
View File

@ -62,7 +62,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;

2
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/PlayerAnimationImpl.java
View File

@ -62,7 +62,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;

2
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/PlayerAnimationImpl.java
View File

@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;

2
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/PlayerAnimationImpl.java
View File

@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;

4
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/PlayerAnimationImpl.java
View File

@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;
@ -137,9 +137,9 @@ public class PlayerAnimationImpl {
NMSImpl.sendPacketNearby(player.getBukkitEntity(), player.getBukkitEntity().getLocation(), packet, radius); NMSImpl.sendPacketNearby(player.getBukkitEntity(), player.getBukkitEntity().getLocation(), packet, radius);
} }
private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
private static final MethodHandle ENTITY_SETPOSE_METHOD = NMS.getMethodHandle(Entity.class, "setPose", true, private static final MethodHandle ENTITY_SETPOSE_METHOD = NMS.getMethodHandle(Entity.class, "setPose", true,
EntityPose.class); EntityPose.class);
private static EnumMap<PlayerAnimation, Integer> DEFAULTS = Maps.newEnumMap(PlayerAnimation.class);
static { static {
DEFAULTS.put(PlayerAnimation.ARM_SWING, 0); DEFAULTS.put(PlayerAnimation.ARM_SWING, 0);
DEFAULTS.put(PlayerAnimation.HURT, 1); DEFAULTS.put(PlayerAnimation.HURT, 1);

2
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/PlayerAnimationImpl.java
View File

@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;

2
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/PlayerAnimationImpl.java
View File

@ -61,7 +61,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;

2
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/PlayerAnimationImpl.java
View File

@ -60,7 +60,7 @@ public class PlayerAnimationImpl {
@Override @Override
public void run() { public void run() {
if (player.dead || !player.valid if (player.dead || !player.valid || !player.getBukkitEntity().hasMetadata("citizens.sitting")
|| !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) { || !player.getBukkitEntity().getMetadata("citizens.sitting").get(0).asBoolean()) {
cancel(); cancel();
return; return;