mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2026-11-18 09:45:28 +00:00
fix: construct a player in jetpack mode with its jetpack
LWOControllablePhysComponent::Deserialize (0x00c45770) reads the jetpack mode, effect, flying and bypass checks bits on construction, and LWOControllablePhysComponent::SendMessage (0x00d2f020) keeps the same from SetJetPackMode. DLU sent the message but never kept it, so a player who came into range of someone flying was told they had no jetpack. Live player constructions in jetpack mode carried effect 167, flying 0 and bypass checks 1, and a 0 after the pickup radius (the client reads that bit into the flying flag). DLU wrote the jetpack mode there. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "JetPackBehavior.h"
|
||||
#include "ControllablePhysicsComponent.h"
|
||||
|
||||
#include "BehaviorBranchContext.h"
|
||||
#include "GameMessages.h"
|
||||
@@ -21,6 +22,7 @@ void JetPackBehavior::Handle(BehaviorContext* context, RakNet::BitStream& bit_st
|
||||
jetPackMode.fVertVel = this->m_VerticalVelocity;
|
||||
jetPackMode.iWarningEffectID = this->m_WarningEffectID;
|
||||
jetPackMode.Send(UNASSIGNED_SYSTEM_ADDRESS);
|
||||
if (auto* const physics = entity->GetComponent<ControllablePhysicsComponent>()) physics->SetJetPackMode(jetPackMode.bUse, jetPackMode.effectID, jetPackMode.bBypassChecks);
|
||||
|
||||
if (entity->IsPlayer()) {
|
||||
auto* character = entity->GetCharacter();
|
||||
@@ -39,6 +41,7 @@ void JetPackBehavior::UnCast(BehaviorContext* context, BehaviorBranchContext bra
|
||||
jetPackMode.target = entity->GetObjectID();
|
||||
jetPackMode.bUse = false;
|
||||
jetPackMode.Send(UNASSIGNED_SYSTEM_ADDRESS);
|
||||
if (auto* const physics = entity->GetComponent<ControllablePhysicsComponent>()) physics->SetJetPackMode(jetPackMode.bUse, jetPackMode.effectID, jetPackMode.bBypassChecks);
|
||||
|
||||
if (entity->IsPlayer()) {
|
||||
auto* character = entity->GetCharacter();
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
*/
|
||||
|
||||
#include "RacingControlComponent.h"
|
||||
#include "ControllablePhysicsComponent.h"
|
||||
|
||||
#include "CharacterComponent.h"
|
||||
#include "DestroyableComponent.h"
|
||||
@@ -276,6 +277,7 @@ void RacingControlComponent::LoadPlayerVehicle(Entity* player,
|
||||
jetPackMode.target = player->GetObjectID();
|
||||
jetPackMode.bUse = false;
|
||||
jetPackMode.Send(UNASSIGNED_SYSTEM_ADDRESS);
|
||||
if (auto* const physics = player->GetComponent<ControllablePhysicsComponent>()) physics->SetJetPackMode(jetPackMode.bUse, jetPackMode.effectID, jetPackMode.bBypassChecks);
|
||||
|
||||
// Set the vehicle's state.
|
||||
GameMessages::NotifyVehicleOfRacingObject notifyVehicle;
|
||||
|
||||
@@ -70,6 +70,7 @@ void PossessorComponent::Mount(Entity* mount) {
|
||||
jetPackMode.target = m_Parent->GetObjectID();
|
||||
jetPackMode.bUse = false;
|
||||
jetPackMode.Send(UNASSIGNED_SYSTEM_ADDRESS);
|
||||
if (auto* const physics = m_Parent->GetComponent<ControllablePhysicsComponent>()) physics->SetJetPackMode(jetPackMode.bUse, jetPackMode.effectID, jetPackMode.bBypassChecks);
|
||||
if (mount->GetComponent<HavokVehiclePhysicsComponent>()) {
|
||||
auto characterComponent = m_Parent->GetComponent<CharacterComponent>();
|
||||
if (characterComponent) characterComponent->SetIsRacing(true);
|
||||
|
||||
@@ -125,7 +125,9 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream& outBitStream, bo
|
||||
outBitStream.Write(m_DirtyEquippedItemInfo || bIsInitialUpdate);
|
||||
if (m_DirtyEquippedItemInfo || bIsInitialUpdate) {
|
||||
outBitStream.Write(m_PickupRadius);
|
||||
outBitStream.Write(m_InJetpackMode);
|
||||
// LWOControllablePhysComponent::Deserialize (0x00c45770) reads this into the same flag as the jetpack block's
|
||||
// flying bit; live wrote 0, also for players in jetpack mode (10,069 player constructions)
|
||||
outBitStream.Write(m_JetpackFlying);
|
||||
|
||||
if (!bIsInitialUpdate) m_DirtyEquippedItemInfo = false;
|
||||
}
|
||||
@@ -181,6 +183,12 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream& outBitStream, bo
|
||||
}
|
||||
}
|
||||
|
||||
void ControllablePhysicsComponent::SetJetPackMode(const bool use, const int32_t effectID, const bool bypassChecks) {
|
||||
m_InJetpackMode = use;
|
||||
m_JetpackEffectID = effectID;
|
||||
m_JetpackBypassChecks = bypassChecks;
|
||||
}
|
||||
|
||||
// A character's save, then where it comes into this world
|
||||
void ControllablePhysicsComponent::LoadFromSaveData(const tinyxml2::XMLDocument& doc) {
|
||||
ReadSaveData(doc);
|
||||
|
||||
@@ -150,6 +150,12 @@ public:
|
||||
*/
|
||||
const bool GetJetpackBypassChecks() const { return m_JetpackBypassChecks; }
|
||||
|
||||
/**
|
||||
* Keeps what a SetJetPackMode sent to the clients said, for the construction of this object: use, effect and
|
||||
* bypass checks, as LWOControllablePhysComponent::SendMessage (0x00d2f020) keeps them
|
||||
*/
|
||||
void SetJetPackMode(bool use, int32_t effectID, bool bypassChecks);
|
||||
|
||||
/**
|
||||
* Set the jetpack effect ID
|
||||
* @param effectID the effect to play while using the jetpack
|
||||
@@ -337,12 +343,12 @@ private:
|
||||
/**
|
||||
* Whether or not this entity is currently flying a jetpack
|
||||
*/
|
||||
bool m_JetpackFlying;
|
||||
bool m_JetpackFlying{ false };
|
||||
|
||||
/**
|
||||
* Bypass jetpack checks, currently unused
|
||||
* Bypass jetpack checks, from the last SetJetPackMode
|
||||
*/
|
||||
bool m_JetpackBypassChecks;
|
||||
bool m_JetpackBypassChecks{ false };
|
||||
|
||||
/**
|
||||
* The effect that plays while using the jetpack
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "GMGreaterThanZeroCommands.h"
|
||||
#include "ControllablePhysicsComponent.h"
|
||||
#include "ChatServerLink.h"
|
||||
#include "DashboardNotify.h"
|
||||
#include "SlashCommandHandler.h"
|
||||
@@ -206,6 +207,7 @@ namespace GMGreaterThanZeroCommands {
|
||||
jetPackMode.target = entity->GetObjectID();
|
||||
jetPackMode.bUse = false;
|
||||
jetPackMode.Send(UNASSIGNED_SYSTEM_ADDRESS);
|
||||
if (auto* const physics = entity->GetComponent<ControllablePhysicsComponent>()) physics->SetJetPackMode(jetPackMode.bUse, jetPackMode.effectID, jetPackMode.bBypassChecks);
|
||||
|
||||
character->SetIsFlying(false);
|
||||
} else {
|
||||
@@ -235,6 +237,7 @@ namespace GMGreaterThanZeroCommands {
|
||||
jetPackMode.fMaxAirspeed = maxAirSpeed;
|
||||
jetPackMode.fVertVel = verticalVelocity;
|
||||
jetPackMode.Send(UNASSIGNED_SYSTEM_ADDRESS);
|
||||
if (auto* const physics = entity->GetComponent<ControllablePhysicsComponent>()) physics->SetJetPackMode(jetPackMode.bUse, jetPackMode.effectID, jetPackMode.bBypassChecks);
|
||||
|
||||
character->SetIsFlying(true);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user