Skip to content

Commit

Permalink
Remove logger print on client side because it's cause problems with U…
Browse files Browse the repository at this point in the history
…nity + Server now check if the game as start before when a player does an action like take an item to prevent crashes
  • Loading branch information
Julien committed Dec 15, 2018
1 parent 4e65274 commit 7c87ed9
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 4 deletions.
2 changes: 0 additions & 2 deletions PralineNetworkSDK/Client/MyNetworkClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,11 @@ public void SendWriter(NetworkWriter writer, DeliveryMethod method) {
private void OnConnectEvent(NetPeer peer) {
_peer = peer;
if (OnConnect != null) OnConnect.Invoke();
Logger.WriteLine("Client connected to the server.");
}

private void OnDisconnectEvent(NetPeer peer, DisconnectInfo info) {
_peer = null;
if (OnDisconnect != null) OnDisconnect.Invoke(info);
Logger.WriteLine("Client disconnected to the server.");
}

private void OnNetworkReceive(NetPeer peer, NetPacketReader msg, DeliveryMethod method) {
Expand Down
43 changes: 41 additions & 2 deletions PralineServer/Server/Room/GameInstance.cs
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,19 @@ private void PlayerCrouchMessage(InGamePlayer player, NetworkMessage msg) {
}

private void DropTrainMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

var writer = new NetworkWriter(InGameProtocol.TCPServerToClient.DropTrain);
writer.Put(player.Id);

_server.SendAll(writer, DeliveryMethod.ReliableOrdered);
}

private void PlayerReloadingMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

bool state = msg.GetBool();

var writer = new NetworkWriter(InGameProtocol.TCPServerToClient.Reloading);
Expand All @@ -217,6 +223,9 @@ private void PlayerReloadingMessage(InGamePlayer player, NetworkMessage msg) {
}

private void EnigmaOpenedMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int enigmaID = msg.GetInt();
Logger.WriteLine("Room {0} : Player {1} open enigma {2}.", Id, player.Id, enigmaID);

Expand All @@ -230,6 +239,9 @@ private void EnigmaOpenedMessage(InGamePlayer player, NetworkMessage msg) {
}

private void OpenCrateMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int crateID = msg.GetInt();
Logger.WriteLine("Room {0} : Player {1} open crate {2}.");

Expand Down Expand Up @@ -259,6 +271,9 @@ private void OpenCrateMessage(InGamePlayer player, NetworkMessage msg) {
}

private void TakeItemMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int itemID = msg.GetInt();
int quantity = msg.GetInt();

Expand All @@ -281,6 +296,9 @@ private void TakeItemMessage(InGamePlayer player, NetworkMessage msg) {
}

private void DropItemMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int itemID = msg.GetInt();
int quantity = msg.GetInt();

Expand All @@ -298,6 +316,9 @@ private void DropItemMessage(InGamePlayer player, NetworkMessage msg) {
}

private void SwitchItemMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int itemID = msg.GetInt();

player.SwitchCurrentItem(itemID);
Expand All @@ -309,12 +330,18 @@ private void SwitchItemMessage(InGamePlayer player, NetworkMessage msg) {
}

private void SwitchKnifeMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

var writer = new NetworkWriter(InGameProtocol.TCPServerToClient.SwitchKnife);
writer.Put(player.Id);
_server.SendAll(writer, DeliveryMethod.ReliableOrdered);
}

private void UseItemMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int itemID = msg.GetInt();
int quantity = msg.GetInt();

Expand All @@ -340,9 +367,9 @@ private void PlayerShootMessage(InGamePlayer player, NetworkMessage msg) {
}

private void PlayerHitMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted)
if (!GameStarted || GameEnded)
return;

int hitPlayerID = msg.GetInt();
short damage = msg.GetShort();

Expand All @@ -363,6 +390,9 @@ private void PlayerHitMessage(InGamePlayer player, NetworkMessage msg) {
}

private void StartThrowingMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

short type = msg.GetShort();

var writer = new NetworkWriter(InGameProtocol.TCPServerToClient.StartThrowing);
Expand All @@ -372,6 +402,9 @@ private void StartThrowingMessage(InGamePlayer player, NetworkMessage msg) {
}

private void ThrowingMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int itemID = msg.GetInt();
short type = msg.GetShort();
int index = msg.GetInt();
Expand All @@ -387,6 +420,9 @@ private void ThrowingMessage(InGamePlayer player, NetworkMessage msg) {
}

private void ThrowableEndMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int index = msg.GetInt();

player.ThrowingEnd(index);
Expand Down Expand Up @@ -428,6 +464,9 @@ private void PlayerTurnMessage(InGamePlayer player, NetworkMessage msg) {
}

private void ThrowableMoveMessage(InGamePlayer player, NetworkMessage msg) {
if (!GameStarted || GameEnded)
return;

int index = msg.GetInt();
Vector3 pos = msg.GetVector3();
Quaternion rot = msg.GetQuaternion();
Expand Down

0 comments on commit 7c87ed9

Please sign in to comment.