Correct and add the missing npc options.

src/org/apollo/game/message/impl/FifthNpcActionMessage.java

@@ -0,0 +1,19 @@
+package org.apollo.game.message.impl;
+
+/**
+ * The third {@link NpcActionMessage}.
+ *
+ * @author Stuart
+ */
+public final class FifthNpcActionMessage extends NpcActionMessage {
+
+	/**
+	 * Creates a new third npc action message.
+	 *
+	 * @param index The index of the npc.
+	 */
+	public FifthNpcActionMessage(int index) {
+		super(5, index);
+	}
+
+}

src/org/apollo/game/message/impl/FourthNpcActionMessage.java

@@ -0,0 +1,19 @@
+package org.apollo.game.message.impl;
+
+/**
+ * The third {@link NpcActionMessage}.
+ *
+ * @author Stuart
+ */
+public final class FourthNpcActionMessage extends NpcActionMessage {
+
+	/**
+	 * Creates a new third npc action message.
+	 *
+	 * @param index The index of the npc.
+	 */
+	public FourthNpcActionMessage(int index) {
+		super(4, index);
+	}
+
+}

src/org/apollo/net/release/r317/FifthNpcActionMessageDecoder.java

@@ -0,0 +1,24 @@
+package org.apollo.net.release.r317;
+
+import org.apollo.game.message.impl.FifthNpcActionMessage;
+import org.apollo.net.codec.game.DataOrder;
+import org.apollo.net.codec.game.DataType;
+import org.apollo.net.codec.game.GamePacket;
+import org.apollo.net.codec.game.GamePacketReader;
+import org.apollo.net.release.MessageDecoder;
+
+/**
+ * A {@link org.apollo.net.release.MessageDecoder} for the {@link org.apollo.game.message.impl.FifthNpcActionMessage}.
+ *
+ * @author Stuart
+ */
+public final class FifthNpcActionMessageDecoder extends MessageDecoder<FifthNpcActionMessage> {
+
+	@Override
+	public FifthNpcActionMessage decode(GamePacket packet) {
+		GamePacketReader reader = new GamePacketReader(packet);
+		int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE);
+		return new FifthNpcActionMessage(index);
+	}
+
+}

src/org/apollo/net/release/r317/FourthNpcActionMessageDecoder.java

@@ -0,0 +1,23 @@
+package org.apollo.net.release.r317;
+
+import org.apollo.game.message.impl.FourthNpcActionMessage;
+import org.apollo.net.codec.game.DataType;
+import org.apollo.net.codec.game.GamePacket;
+import org.apollo.net.codec.game.GamePacketReader;
+import org.apollo.net.release.MessageDecoder;
+
+/**
+ * A {@link org.apollo.net.release.MessageDecoder} for the {@link org.apollo.game.message.impl.FourthNpcActionMessage}.
+ *
+ * @author Stuart
+ */
+public final class FourthNpcActionMessageDecoder extends MessageDecoder<FourthNpcActionMessage> {
+
+	@Override
+	public FourthNpcActionMessage decode(GamePacket packet) {
+		GamePacketReader reader = new GamePacketReader(packet);
+		int index = (int) reader.getSigned(DataType.SHORT);
+		return new FourthNpcActionMessage(index);
+	}
+
+}

src/org/apollo/net/release/r317/Release317.java

@@ -143,9 +143,12 @@ public final class Release317 extends Release {
 		register(121, spamMessageDecoder);
 
 		register(155, new FirstNpcActionMessageDecoder());
-		register(17, new SecondNpcActionMessageDecoder());
+		register(72, new SecondNpcActionMessageDecoder());
-		register(21, new ThirdNpcActionMessageDecoder());
+        register(17, new ThirdNpcActionMessageDecoder());
-		register(236, new TakeTileItemMessageDecoder());
+		register(21, new FourthNpcActionMessageDecoder());
+        register(18, new FifthNpcActionMessageDecoder());
+
+        register(236, new TakeTileItemMessageDecoder());
 		register(192, new ItemOnObjectMessageDecoder());
 
 		register(128, new FirstPlayerActionMessageDecoder());

src/org/apollo/net/release/r317/SecondNpcActionMessageDecoder.java

@@ -14,7 +14,7 @@ public final class SecondNpcActionMessageDecoder extends MessageDecoder<SecondNp
 	@Override
 	public SecondNpcActionMessage decode(GamePacket packet) {
 		GamePacketReader reader = new GamePacketReader(packet);
-		int index = (int) reader.getUnsigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
+		int index = (int) reader.getSigned(DataType.SHORT, DataTransformation.ADD);
 		return new SecondNpcActionMessage(index);
 	}
 

src/org/apollo/net/release/r317/ThirdNpcActionMessageDecoder.java

@@ -1,9 +1,7 @@
 package org.apollo.net.release.r317;
 
 import org.apollo.game.message.impl.ThirdNpcActionMessage;
-import org.apollo.net.codec.game.DataType;
+import org.apollo.net.codec.game.*;
-import org.apollo.net.codec.game.GamePacket;
-import org.apollo.net.codec.game.GamePacketReader;
 import org.apollo.net.release.MessageDecoder;
 
 /**
@@ -16,7 +14,7 @@ public final class ThirdNpcActionMessageDecoder extends MessageDecoder<ThirdNpcA
 	@Override
 	public ThirdNpcActionMessage decode(GamePacket packet) {
 		GamePacketReader reader = new GamePacketReader(packet);
-		int index = (int) reader.getSigned(DataType.SHORT);
+		int index = (int) reader.getSigned(DataType.SHORT, DataOrder.LITTLE, DataTransformation.ADD);
 		return new ThirdNpcActionMessage(index);
 	}