edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 15:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #2925

Browse source 
2925: bugfix: laser_damage was removed from tunes of 0.7 protocol r=def- a=pure-luck-999

Before:

![image](https://user-images.githubusercontent.com/68428243/94279573-f7ec0f80-ff54-11ea-852f-f6a2a195f935.png)

After:

![image](https://user-images.githubusercontent.com/68428243/94279452-c96e3480-ff54-11ea-8af6-d12ef6b86312.png)


Co-authored-by: Pure luck <pure_luck@fastmail.com>
This commit is contained in:
bors[bot] 2020-09-25 14:49:13 +00:00 committed by GitHub
parent 32c77faecc 3cd0f30d55
commit f63f693656
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/server/gamecontext.cpp
View file

@ -676,9 +676,13 @@ void CGameContext::SendTuningParams(int ClientID, int Zone)
{
if (m_apPlayers[ClientID] && m_apPlayers[ClientID]->GetCharacter())
{
if((i==31) // collision
&& (m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO
|| m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOCOLL))
if((i == 30) // laser_damage is removed from 0.7
&& (Server()->IsSixup(ClientID)))
{
continue;
}
else if((i == 31) // collision
&& (m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_SOLO || m_apPlayers[ClientID]->GetCharacter()->NeededFaketuning() & FAKETUNE_NOCOLL))
{
Msg.AddInt(0);
}