Merge pull request #1021 from booky10/fix/food-properties

Fix order of reading fields in food properties
retrooper · Oct 6, 2024 · 487bcc3 · 487bcc3
2 parents fea6e90 + 1f86c65
commit 487bcc3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ava/com/github/retrooper/packetevents/protocol/component/builtin/item/FoodProperties.java b/...ava/com/github/retrooper/packetevents/protocol/component/builtin/item/FoodProperties.java
@@ -60,9 +60,9 @@ public static FoodProperties read(PacketWrapper<?> wrapper) {
         float saturation = wrapper.readFloat();
         boolean canAlwaysEat = wrapper.readBoolean();
         float eatSeconds = wrapper.readFloat();
-        List<PossibleEffect> effects = wrapper.readList(PossibleEffect::read);
         ItemStack usingConvertsTo = wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)
                 ? wrapper.readOptional(PacketWrapper::readItemStack) : null;
+        List<PossibleEffect> effects = wrapper.readList(PossibleEffect::read);
         return new FoodProperties(nutrition, saturation, canAlwaysEat, eatSeconds, effects, usingConvertsTo);
     }
 
@@ -71,10 +71,10 @@ public static void write(PacketWrapper<?> wrapper, FoodProperties props) {
         wrapper.writeFloat(props.saturation);
         wrapper.writeBoolean(props.canAlwaysEat);
         wrapper.writeFloat(props.eatSeconds);
-        wrapper.writeList(props.effects, PossibleEffect::write);
         if (wrapper.getServerVersion().isNewerThanOrEquals(ServerVersion.V_1_21)) {
             wrapper.writeOptional(props.usingConvertsTo, PacketWrapper::writeItemStack);
         }
+        wrapper.writeList(props.effects, PossibleEffect::write);
     }
 
     public int getNutrition() {