Procházet zdrojové kódy

ConnectAsync 和 AcceptAsync,peer还未创建,peer disconnect不会影响到这两个函数
去除掉这两个事件的异常处理

tanghai před 13 roky
rodič
revize
f89758f1b8

+ 2 - 13
CSharp/Platform/ENetCS/ClientHost.cs

@@ -43,14 +43,7 @@ namespace ENet
 			}
 			var peer = new Peer(peerPtr);
 			this.PeersManager.Add(peerPtr, peer);
-			peer.PeerEvent.Connected += e =>
-			{
-				if (e.EventState == EventState.DISCONNECTED)
-				{
-					tcs.TrySetException(new ENetException(3, "Peer Disconnected In Connect!"));
-				}
-				tcs.TrySetResult(peer);
-			};
+			peer.PeerEvent.Connected += e => tcs.TrySetResult(peer);
 			return tcs.Task;
 		}
 
@@ -92,11 +85,7 @@ namespace ENet
 						this.PeersManager.Remove(ev.PeerPtr);
 						peer.Dispose();
 
-						if (peerEvent.Connected != null)
-						{
-							peerEvent.OnConnected(ev);
-						}
-						else if (peerEvent.Received != null)
+						if (peerEvent.Received != null)
 						{
 							peerEvent.OnReceived(ev);
 						}

+ 1 - 10
CSharp/Platform/ENetCS/ServerHost.cs

@@ -43,10 +43,6 @@ namespace ENet
 			var tcs = new TaskCompletionSource<Peer>();
 			this.acceptEvent += e =>
 			{
-				if (e.EventState == EventState.DISCONNECTED)
-				{
-					tcs.TrySetException(new ENetException(3, "Peer Disconnected In Accept!"));
-				}
 				var peer = new Peer(e.PeerPtr);
 				this.PeersManager.Add(e.PeerPtr, peer);
 				tcs.TrySetResult(peer);
@@ -94,12 +90,7 @@ namespace ENet
 						this.PeersManager.Remove(ev.PeerPtr);
 						peer.Dispose();
 						
-
-						if (this.acceptEvent != null)
-						{
-							this.acceptEvent(ev);
-						}
-						else if (peerEvent.Received != null)
+						if (peerEvent.Received != null)
 						{
 							peerEvent.OnReceived(ev);
 						}