Skip to content

Add setPedWearingJetpack client-side #4601

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MegadreamsBE wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add setPedWearingJetpack client-side #4601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b28b162
Fix client-side peds not being able to enter/exit local vehicles
MegadreamsBE Aug 28, 2025
fb26fe2
Add setPedWearingJetpack client-side
MegadreamsBE Aug 28, 2025
2258e69
Merge branch 'bugfix/client-side-enter-exit' into feature/client-side…
MegadreamsBE Aug 30, 2025
7851ab0
Merge branch 'master' into feature/client-side-jetpack
MegadreamsBE Jan 5, 2026
7772407
Merge branch 'master' into feature/client-side-jetpack
MegadreamsBE Jan 7, 2026
e18219b
Add missing client-side jetpack variable logic
MegadreamsBE Jan 7, 2026
dcfde02
Merge branch 'master' into feature/client-side-jetpack
FileEX Jan 8, 2026
6b49a76
Merge branch 'master' into feature/client-side-jetpack
MegadreamsBE Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ void CLuaPedDefs::LoadFunctions()
{"setPedExitVehicle", ArgumentParser<SetPedExitVehicle>},
{"setPedBleeding", ArgumentParser<SetPedBleeding>},
{"playPedVoiceLine", ArgumentParser<PlayPedVoiceLine>},
{"setPedWearingJetpack", ArgumentParser<SetPedWearingJetpack>},

{"getPedVoice", GetPedVoice},
{"getElementBonePosition", ArgumentParserWarn<false, GetElementBonePosition>},
Expand Down Expand Up @@ -213,12 +214,13 @@ void CLuaPedDefs::AddClass(lua_State* luaVM)
lua_classfunction(luaVM, "setExitVehicle", "setPedExitVehicle");
lua_classfunction(luaVM, "setBleeding", "setPedBleeding");
lua_classfunction(luaVM, "playVoiceLine", "playPedVoiceLine");
lua_classfunction(luaVM, "setWearingJetpack", "setPedWearingJetpack");

lua_classvariable(luaVM, "vehicle", OOP_WarpPedIntoVehicle, GetPedOccupiedVehicle);
lua_classvariable(luaVM, "vehicleSeat", NULL, "getPedOccupiedVehicleSeat");
lua_classvariable(luaVM, "canBeKnockedOffBike", "setPedCanBeKnockedOffBike", "canPedBeKnockedOffBike");
lua_classvariable(luaVM, "hasJetPack", NULL, "doesPedHaveJetPack");
lua_classvariable(luaVM, "jetpack", NULL, "isPedWearingJetpack"); // introduced in 1.5.5-9.13846
lua_classvariable(luaVM, "jetpack", "setPedWearingJetpack", "isPedWearingJetpack"); // introduced in 1.5.5-9.13846
lua_classvariable(luaVM, "armor", "setPedArmor", "getPedArmor");
lua_classvariable(luaVM, "fightingStyle", "setPedFightingStyle", "getPedFightingStyle");
lua_classvariable(luaVM, "cameraRotation", "setPedCameraRotation", "getPedCameraRotation");
Expand Down Expand Up @@ -2585,3 +2587,11 @@ void CLuaPedDefs::PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<

ped->Say(speechContextId, probability.value_or(1.0f));
}

bool CLuaPedDefs::SetPedWearingJetpack(CClientPed* ped, bool state)
{
if (!ped->IsLocalEntity())
return false;

return ped->SetHasJetPack(state);
}
2 changes: 2 additions & 0 deletions Client/mods/deathmatch/logic/luadefs/CLuaPedDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,6 @@ class CLuaPedDefs : public CLuaDefs
static bool killPedTask(CClientPed* ped, taskType taskType, std::uint8_t taskNumber, std::optional<bool> gracefully);

static void PlayPedVoiceLine(CClientPed* ped, int speechId, std::optional<float> probability);

static bool SetPedWearingJetpack(CClientPed* ped, bool state);
};
Loading