Project cleanup pre merge.

src/engine/net/client/msg/CityChoiceMsg.java

@@ -20,88 +20,89 @@ import engine.objects.PlayerCharacter;
 
 public class CityChoiceMsg extends ClientNetMsg {
 
-	private PlayerCharacter pc;
-	private boolean isTeleport;
-	private int msgType;
-	private int cityID;
+    private PlayerCharacter pc;
+    private boolean isTeleport;
+    private int msgType;
+    private int cityID;
 
-	/**
-	 * This is the general purpose constructor.
-	 */
-	public CityChoiceMsg(PlayerCharacter pc, boolean isTeleport) {
-		super(Protocol.CITYCHOICE);
-		this.pc = pc;
-		this.isTeleport = isTeleport;
-	}
+    /**
+     * This is the general purpose constructor.
+     */
+    public CityChoiceMsg(PlayerCharacter pc, boolean isTeleport) {
+        super(Protocol.CITYCHOICE);
+        this.pc = pc;
+        this.isTeleport = isTeleport;
+    }
 
-	/**
-	 * This constructor is used by NetMsgFactory. It attempts to deserialize the
-	 * ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
-	 * past the limit) then this constructor Throws that Exception to the
-	 * caller.
-	 */
-	public CityChoiceMsg(AbstractConnection origin, ByteBufferReader reader)  {
-		super(Protocol.CITYCHOICE, origin, reader);
-	}
+    /**
+     * This constructor is used by NetMsgFactory. It attempts to deserialize the
+     * ByteBuffer into a message. If a BufferUnderflow occurs (based on reading
+     * past the limit) then this constructor Throws that Exception to the
+     * caller.
+     */
+    public CityChoiceMsg(AbstractConnection origin, ByteBufferReader reader) {
+        super(Protocol.CITYCHOICE, origin, reader);
+    }
 
-	/**
-	 * Copy constructor
-	 */
-	public CityChoiceMsg(CityChoiceMsg msg) {
-		super(Protocol.CITYCHOICE);
-		this.pc = msg.pc;
-		this.isTeleport = msg.isTeleport;
-	}
+    /**
+     * Copy constructor
+     */
+    public CityChoiceMsg(CityChoiceMsg msg) {
+        super(Protocol.CITYCHOICE);
+        this.pc = msg.pc;
+        this.isTeleport = msg.isTeleport;
+    }
 
-	/**
-	 * @see AbstractNetMsg#getPowerOfTwoBufferSize()
-	 */
-	@Override
-	protected int getPowerOfTwoBufferSize() {
-		// Larger size for historically larger opcodes
-		return (12);
-	}
-	/**
-	 * Deserializes the subclass specific items from the supplied ByteBufferReader.
-	 */
-	@Override
-	protected void _deserialize(ByteBufferReader reader)  {
-		//Do we even want to try this?
-		this.msgType = reader.getInt();
-		reader.getInt();
-		this.cityID = reader.getInt();
-		reader.getInt();
-	}
+    /**
+     * @see AbstractNetMsg#getPowerOfTwoBufferSize()
+     */
+    @Override
+    protected int getPowerOfTwoBufferSize() {
+        // Larger size for historically larger opcodes
+        return (12);
+    }
 
-	/**
-	 * Serializes the subclass specific items to the supplied ByteBufferWriter.
-	 */
-	@Override
-	protected void _serialize(ByteBufferWriter writer) {
-	
-	}
+    /**
+     * Deserializes the subclass specific items from the supplied ByteBufferReader.
+     */
+    @Override
+    protected void _deserialize(ByteBufferReader reader) {
+        //Do we even want to try this?
+        this.msgType = reader.getInt();
+        reader.getInt();
+        this.cityID = reader.getInt();
+        reader.getInt();
+    }
 
-	public PlayerCharacter pc() {
-		return this.pc;
-	}
+    /**
+     * Serializes the subclass specific items to the supplied ByteBufferWriter.
+     */
+    @Override
+    protected void _serialize(ByteBufferWriter writer) {
 
-	public boolean isTeleport() {
-		return this.isTeleport;
-	}
+    }
 
-	public void setPC(PlayerCharacter pc) {
-		this.pc = pc;
-	}
+    public PlayerCharacter pc() {
+        return this.pc;
+    }
 
-	public void setIsTeleport(boolean value) {
-		this.isTeleport = value;
-	}
+    public boolean isTeleport() {
+        return this.isTeleport;
+    }
 
-	public int getMsgType() {
-		return msgType;
-	}
+    public void setPC(PlayerCharacter pc) {
+        this.pc = pc;
+    }
 
-	public int getCityID() {
-		return cityID;
-	}
+    public void setIsTeleport(boolean value) {
+        this.isTeleport = value;
+    }
+
+    public int getMsgType() {
+        return msgType;
+    }
+
+    public int getCityID() {
+        return cityID;
+    }
 }