progtime/ZoFo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'DevelopmentX' of github.com:progtime-net/ZoFo into DevelopmentX

Browse source
This commit is contained in:
SergoDobro 2024-08-20 20:10:57 +03:00
commit ffff0fb299
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ZoFo/GameCore/Client.cs
View file

@ -252,12 +252,12 @@ namespace ZoFo.GameCore
else if (update is UpdateGameEnded)
{
GameEnd();
}
else if (update is UpdatePlayerParametrs && update.IdEntity == myPlayer.Id) //aaa
}
else if (update is UpdatePlayerParametrs && myPlayer !=null && update.IdEntity == myPlayer.Id) //aaa
{
UpdatePlayerHealth(update as UpdatePlayerParametrs);
}
else if (update is UpdateLoot && update.IdEntity == myPlayer.Id)//aaa
else if (update is UpdateLoot && myPlayer != null && update.IdEntity == myPlayer.Id)//aaa
{
if ((update as UpdateLoot).quantity == 0)
{

2
ZoFo/GameCore/GameManagers/NetworkManager/ClientNetworkManager.cs
View file

@ -20,7 +20,7 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
{
public class ClientNetworkManager
{
public int PlayerId;
public int PlayerId = 0;
private IPEndPoint endPoint;
private IPEndPoint sendingEP;
private Socket socket;

2
ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs
View file

@ -136,8 +136,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
if (sendedData.Count != 0)
{
for (int i = 0; i < clientsEP.Count; i++)
{
foreach (Datagramm Dgramm in sendedData.Where(x => x.PlayerId == i+1))

1
ZoFo/GameCore/GameManagers/NetworkManager/Updates/ServerToClient/UpdateCreatePlayer.cs
View file

@ -10,7 +10,6 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager.Updates.ServerToClient
public class UpdateCreatePlayer : UpdateData
{
public int PlayerId { get; set; }
public SerializableVector2 position { get; set; }
public UpdateCreatePlayer()
{
isImportant = true;

5
ZoFo/GameCore/Server.cs
View file

@ -71,7 +71,10 @@ namespace ZoFo.GameCore
if (players.Count > 0)
{
UpdateInput data = updateData as UpdateInput;
players[data.PlayerId - 1].HandleNewInput(data);
if (data.PlayerId > 0)
{
players[data.PlayerId - 1].HandleNewInput(data);
}
}
//TODO id instead of 0
else