From 3192fe561baa525955209172edaf396ee053cfa1 Mon Sep 17 00:00:00 2001 From: Christian Hughes Date: Sat, 10 Jul 2021 18:02:02 -0500 Subject: [PATCH] Add DataTransactionResult#successfulValue and replace old usages. --- .../datasync/entity/EntityFlagsConverter.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/spongepowered/common/data/datasync/entity/EntityFlagsConverter.java b/src/main/java/org/spongepowered/common/data/datasync/entity/EntityFlagsConverter.java index 18ef7d00ed9..c2544a59459 100644 --- a/src/main/java/org/spongepowered/common/data/datasync/entity/EntityFlagsConverter.java +++ b/src/main/java/org/spongepowered/common/data/datasync/entity/EntityFlagsConverter.java @@ -119,7 +119,7 @@ public Byte getValueFromEvent(final Byte originalValue, final DataTransactionRes newValue = (byte) (newInvisible ? newValue | EntityFlagsConverter.INVISIBLE_MASK : newValue & ~EntityFlagsConverter.INVISIBLE_MASK); newValue = (byte) (newGlowing ? newValue | EntityFlagsConverter.GLOWING_MASK : newValue & ~EntityFlagsConverter.GLOWING_MASK); newValue = (byte) (newElytra ? newValue | EntityFlagsConverter.FLYING_ELYTRA_MASK - : newValue & ~EntityFlagsConverter.FLYING_ELYTRA_MASK + : newValue & ~EntityFlagsConverter.FLYING_ELYTRA_MASK ); return newValue; } @@ -128,12 +128,12 @@ private boolean getFlag(final byte value, final int mask) { return (value & mask) != 0; } - public static final int ON_FIRE_MASK = 0b00000001; // 0x01 - public static final int CROUCHED_MASK = 0b00000010; // 0x02 - public static final int UNUSED_MASK = 0b00000100; // 0x04 - public static final int SPRINTING_MASK = 0b00001000; // 0x08 - public static final int UNUSED_2_MASK = 0b00010000; // 0x10 - public static final int INVISIBLE_MASK = 0b00100000; // 0x20 - public static final int GLOWING_MASK = 0b01000000; // 0x40 - public static final int FLYING_ELYTRA_MASK = 0b10000000; // 0x80 + public static final int ON_FIRE_MASK = 0b00000001; // 0x01 + public static final int CROUCHED_MASK = 0b00000010; // 0x02 + public static final int UNUSED_MASK = 0b00000100; // 0x04 + public static final int SPRINTING_MASK = 0b00001000; // 0x08 + public static final int UNUSED_2_MASK = 0b00010000; // 0x10 + public static final int INVISIBLE_MASK = 0b00100000; // 0x20 + public static final int GLOWING_MASK = 0b01000000; // 0x40 + public static final int FLYING_ELYTRA_MASK = 0b10000000; // 0x80 }