Has errors. Merged from upstream quality_assurance

This commit is contained in:
Obique
2017-08-14 19:05:23 -05:00
parent 5c21fb5acd
commit 800b9366b1
378 changed files with 1028 additions and 22565 deletions
@@ -34,8 +34,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import network.packets.Packet;
import network.packets.swg.ErrorMessage;
import com.projectswg.common.network.packets.SWGPacket;
import com.projectswg.common.network.packets.swg.ErrorMessage;
import resources.objects.player.PlayerObject;
import resources.player.Player;
import test_resources.GenericCreatureObject;
@@ -84,8 +85,8 @@ public class TestZoneRequester {
private final AtomicBoolean sentError = new AtomicBoolean(false);
@Override
public void sendPacket(Packet ... packets) {
if (packets.length == 1 && packets[0] instanceof ErrorMessage)
public void sendPacket(SWGPacket ... SWGPackets) {
if (SWGPackets.length == 1 && SWGPackets[0] instanceof ErrorMessage)
sentError.set(true);
}