diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 2eb45faf114..7bf02231cb3 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -1211,7 +1211,7 @@ void CCharacter::SnapCharacter(int SnappingClient, int Id) pCharacter->m_Weapon = Weapon; pCharacter->m_AmmoCount = AmmoCount; pCharacter->m_Health = Health; - pCharacter->m_Armor = m_Armor; + pCharacter->m_Armor = Armor; pCharacter->m_PlayerFlags = GetPlayer()->m_PlayerFlags; } else diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp index c31f7c2f3f8..572485dda0c 100644 --- a/src/game/server/entities/laser.cpp +++ b/src/game/server/entities/laser.cpp @@ -92,7 +92,7 @@ bool CLaser::HitCharacter(vec2 From, vec2 To) } else if(m_Type == WEAPON_LASER) { - pHit->TakeDamage(vec2(0, 0), 5, m_Owner, WEAPON_LASER); + pHit->TakeDamage(vec2(0, 0), 10, m_Owner, WEAPON_LASER); pHit->UnFreeze(); } return true; diff --git a/src/game/server/gamemodes/ctf.cpp b/src/game/server/gamemodes/ctf.cpp index fb84ee50741..e2fc589df12 100644 --- a/src/game/server/gamemodes/ctf.cpp +++ b/src/game/server/gamemodes/ctf.cpp @@ -65,6 +65,11 @@ bool CGameControllerCTF::OnCharacterTakeDamage(vec2 &Force, int &Dmg, int &From, Dmg = 0; } + if(WEAPON_LASER == Weapon) + { + Dmg = 5; + } + int damage = Dmg; if(From == Character.GetPlayer()->GetCid())