Merge remote-tracking branch 'origin/develop' into feature/HostAttack_Hoang
# Conflicts: # Assets/PerfectWorld/Scripts/Network/CSNetwork/GameSession.cs # Assets/Scenes/a61.unity # Assets/Scripts/CECHostPlayer.cs
This commit is contained in:
@@ -926,7 +926,7 @@ public class CECHostPlayer : CECPlayer
|
||||
m_aabb.Extents.Set(0.3f, 0.9f, 0.3f);
|
||||
m_aabbServer = m_aabb;
|
||||
CalcPlayerAABB();
|
||||
|
||||
SetPos(pos);
|
||||
// Create work manager
|
||||
m_pWorkMan = new CECHPWorkMan(this);
|
||||
if (m_pWorkMan == null)
|
||||
|
||||
Reference in New Issue
Block a user