From ef740b36e0b437c7fc7615899dde53cb00c778f0 Mon Sep 17 00:00:00 2001 From: Gary Tierney Date: Mon, 21 Dec 2015 04:03:26 +0000 Subject: [PATCH] Fix short circuit logic in ItemDefinitionDecoder * Replaces an OR, with what should have been an AND while decoding unused item definition info. --- .../main/org/apollo/cache/decoder/ItemDefinitionDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/src/main/org/apollo/cache/decoder/ItemDefinitionDecoder.java b/cache/src/main/org/apollo/cache/decoder/ItemDefinitionDecoder.java index d7d495c2..5ba66621 100644 --- a/cache/src/main/org/apollo/cache/decoder/ItemDefinitionDecoder.java +++ b/cache/src/main/org/apollo/cache/decoder/ItemDefinitionDecoder.java @@ -108,7 +108,7 @@ public final class ItemDefinitionDecoder implements Runnable { buffer.getShort(); buffer.getShort(); } - } else if (opcode == 78 || opcode == 79 || opcode >= 90 || opcode <= 93 || opcode == 95) { + } else if (opcode == 78 || opcode == 79 || (opcode >= 90 && opcode <= 93) || opcode == 95) { buffer.getShort(); } else if (opcode == 97) { definition.setNoteInfoId(buffer.getShort() & 0xFFFF);