#4561 NPE When Using Remove button in Deploy phase

[Luke Waldron]

Went to reinforce a game in progress, but wound up with duplicates in my reinforcements. Tried using "Remove Unit" to pare away the excess, but I wound up where the game was expecting me to deploy additional units, but I had removed all the remaining units to deploy. Log and Save attached.

[Nicholas Walczak]

This bug can happen whenever using the "Remove" button during deploy and the player is deploying multiple units.

[Nicholas Walczak]

Fixed in [r11961].

There were two issues here, the first of which was in DeploymentDisplay, which was covering up the issue in Server.receiveEntityDelete. In DeploymentDisplay.remove(), DeploymentDisplay.beginMyTurn() was being called, which basically started a new turn for the Entity that was just removed. It sets the current entity in DeploymentDisplay to an Entity that is shortly removed by the Server, so when you click the Remove button, it tries to remove an Entity that doesn't exist. There's no reason for DeploymentDisplay.remove() to call beginMyTurn. Instead, it just needs to set cen (the current entity Id), to Entity.NONE.

Secondly, Server.receiveEntityDelete was changed a while back to handle a list of Entitys. When this happened, it was setup to inform the client of a turn change before notifying the Client that the Entity was deleted. I adjusted this order. (Otherwise the Client would try to start a turn for an Entity that could potentially get deleted).