Skip to content

Commit a12a66c

Browse files
authored
fix ninja with solo + unsolo no collision (ddnet#11607)
2 parents 2e3a98c + 7bc6f5b commit a12a66c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

src/game/client/prediction/entities/character.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ void CCharacter::HandleNinja()
157157

158158
// Don't hit players in solo parts
159159
if(TeamsCore()->GetSolo(ClientId))
160-
return;
160+
continue;
161161

162162
// make sure we haven't Hit this object before
163163
bool AlreadyHit = false;

src/game/server/entities/character.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ void CCharacter::HandleNinja()
351351

352352
// Don't hit players in solo parts
353353
if(Teams()->m_Core.GetSolo(ClientId))
354-
return;
354+
continue;
355355

356356
// make sure we haven't Hit this object before
357357
bool AlreadyHit = false;

src/game/server/teehistorian.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CTeehistorianPacker : public CAbstractPacker
2424
static const char TEEHISTORIAN_NAME[] = "[email protected]";
2525
static const CUuid TEEHISTORIAN_UUID = CalculateUuid(TEEHISTORIAN_NAME);
2626
static const char TEEHISTORIAN_VERSION[] = "2";
27-
static const char TEEHISTORIAN_VERSION_MINOR[] = "17";
27+
static const char TEEHISTORIAN_VERSION_MINOR[] = "18";
2828

2929
#define UUID(id, name) static const CUuid UUID_##id = CalculateUuid(name);
3030
#include <engine/shared/teehistorian_ex_chunks.h>

src/test/teehistorian_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class TeeHistorian : public ::testing::Test
107107
void Expect(const unsigned char *pOutput, size_t OutputSize)
108108
{
109109
static CUuid TEEHISTORIAN_UUID = CalculateUuid("[email protected]");
110-
static const char PREFIX1[] = "{\"comment\":\"[email protected]\",\"version\":\"2\",\"version_minor\":\"17\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
110+
static const char PREFIX1[] = "{\"comment\":\"[email protected]\",\"version\":\"2\",\"version_minor\":\"18\",\"game_uuid\":\"a1eb7182-796e-3b3e-941d-38ca71b2a4a8\",\"server_version\":\"DDNet test\",\"start_time\":\"";
111111
static const char PREFIX2[] = "\",\"server_name\":\"server name\",\"server_port\":\"8303\",\"game_type\":\"game type\",\"map_name\":\"Kobra 3 Solo\",\"map_size\":\"903514\",\"map_sha256\":\"0123456789012345678901234567890123456789012345678901234567890123\",\"map_crc\":\"eceaf25c\",\"prng_description\":\"test-prng:02468ace\",\"config\":{},\"tuning\":{},\"uuids\":[";
112112
static const char PREFIX3[] = "]}";
113113

0 commit comments

Comments
 (0)