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

Merge pull request #7880 from ChillerDragon/pr_fix_07_armor

Browse source 
Fix 0.7 armor being snapped as health
This commit is contained in:
Dennis Felsing 2024-01-30 12:14:13 +00:00 committed by GitHub
parent 8366bfb881 40633d800a
commit 0c2001be0b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -484,6 +484,8 @@ bool CGameContext::SnapPickup(const CSnapContext &Context, int SnapID, const vec
pPickup->m_Type = SubType == WEAPON_SHOTGUN ? protocol7::PICKUP_SHOTGUN : SubType == WEAPON_GRENADE ? protocol7::PICKUP_GRENADE : protocol7::PICKUP_LASER;
else if(Type == POWERUP_NINJA)
pPickup->m_Type = protocol7::PICKUP_NINJA;
else if(Type == POWERUP_ARMOR)
pPickup->m_Type = protocol7::PICKUP_ARMOR;
}
else if(Context.GetClientVersion() >= VERSION_DDNET_ENTITY_NETOBJS)
{