Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc fixes/missed stuff

Browse Source
This commit is contained in:
hondacrx
2021-12-27 18:11:38 -05:00
parent 1dbe035242
commit 74133edce1
6 changed files with 20 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.cs
+2 -2
View File
@@ -7393,8 +7393,8 @@ namespace Game.Entities
}
}
public Gender GetNativeGender() { return (Gender)(byte)m_playerData.NativeSex; }
public void SetNativeGender(Gender sex) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.NativeSex), (byte)sex); }
public override Gender GetNativeGender() { return (Gender)(byte)m_playerData.NativeSex; }
public override void SetNativeGender(Gender sex) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.NativeSex), (byte)sex); }
public void SetPvpTitle(byte pvpTitle) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.PvpTitle), pvpTitle); }
public void SetArenaFaction(byte arenaFaction) { SetUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.ArenaFaction), arenaFaction); }
public void ApplyModFakeInebriation(int mod, bool apply) { ApplyModUpdateFieldValue(m_values.ModifyValue(m_playerData).ModifyValue(m_playerData.FakeInebriation), mod, apply); }
Source/Game/Entities/Unit/Unit.cs
+1 -14
View File
@@ -921,17 +921,10 @@ namespace Game.Entities
if (vehicle.GetBase().IsCreature())
{
// If a player entered a vehicle that is part of a formation, remove it from said formation and replace current movement generator with MoveIdle (no movement)
// If a player entered a vehicle that is part of a formation, remove it from said formation
CreatureGroup creatureGroup = vehicle.GetBase().ToCreature().GetFormation();
if (creatureGroup != null)
{
creatureGroup.RemoveMember(vehicle.GetBase().ToCreature());
vehicle.GetBase().GetMotionMaster().MoveIdle();
}
// If the vehicle has the random movement generator active, replace it with MoveIdle (no movement) so it won't override player control
if (vehicle.GetBase().GetMotionMaster().GetCurrentMovementGeneratorType() == MovementGeneratorType.Random)
vehicle.GetBase().GetMotionMaster().MoveIdle();
}
}
@@ -1040,14 +1033,8 @@ namespace Game.Entities
GetMotionMaster().LaunchMoveSpline(init, EventId.VehicleExit, MovementGeneratorPriority.Highest);
if (player != null)
{
player.ResummonPetTemporaryUnSummonedIfAny();
// When a player exits a creature vehicle, restore its default motion generator (if any)
if (vehicle.GetBase().IsCreature())
vehicle.GetBase().GetMotionMaster().InitializeDefault();
}
if (vehicle.GetBase().HasUnitTypeMask(UnitTypeMask.Minion) && vehicle.GetBase().IsTypeId(TypeId.Unit))
if (((Minion)vehicle.GetBase()).GetOwner() == this)
vehicle.GetBase().ToCreature().DespawnOrUnsummon(vehicle.GetDespawnDelay());