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

Core/GameObjects: Allow creatures to use chair gameobjects directly

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/277c063413e4ec54ba943abd87cc1d273ad035e5)
This commit is contained in:
hondacrx
2022-10-14 16:56:15 -04:00
parent d4cf5e89df
commit 4f89dad639
1 changed files with 17 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/GameObject/GameObject.cs
+17 -24
View File
@@ -1663,11 +1663,6 @@ namespace Game.Entities
case GameObjectTypes.Chair: //7 case GameObjectTypes.Chair: //7
{ {
GameObjectTemplate info = GetGoInfo(); GameObjectTemplate info = GetGoInfo();
if (info == null)
return;
if (!user.IsTypeId(TypeId.Player))
return;
if (ChairListSlots.Empty()) // this is called once at first chair use to make list of available slots if (ChairListSlots.Empty()) // this is called once at first chair use to make list of available slots
{ {
@@ -1680,8 +1675,6 @@ namespace Game.Entities
ChairListSlots[0] = default; // error in DB, make one default slot ChairListSlots[0] = default; // error in DB, make one default slot
} }
Player player = user.ToPlayer();
// a chair may have n slots. we have to calculate their positions and teleport the player to the nearest one // a chair may have n slots. we have to calculate their positions and teleport the player to the nearest one
float lowestDist = SharedConst.DefaultVisibilityDistance; float lowestDist = SharedConst.DefaultVisibilityDistance;
@@ -1695,34 +1688,36 @@ namespace Game.Entities
// find nearest slot // find nearest slot
bool found_free_slot = false; bool found_free_slot = false;
foreach (var slot in ChairListSlots.ToList()) foreach (var (slot, sittingUnit) in ChairListSlots.ToList())
{ {
// the distance between this slot and the center of the go - imagine a 1D space // the distance between this slot and the center of the go - imagine a 1D space
float relativeDistance = (info.size * slot.Key) - (info.size * (info.Chair.chairslots - 1) / 2.0f); float relativeDistance = (info.size * slot) - (info.size * (info.Chair.chairslots - 1) / 2.0f);
float x_i = (float)(GetPositionX() + relativeDistance * Math.Cos(orthogonalOrientation)); float x_i = (float)(GetPositionX() + relativeDistance * Math.Cos(orthogonalOrientation));
float y_i = (float)(GetPositionY() + relativeDistance * Math.Sin(orthogonalOrientation)); float y_i = (float)(GetPositionY() + relativeDistance * Math.Sin(orthogonalOrientation));
if (!slot.Value.IsEmpty()) if (!sittingUnit.IsEmpty())
{ {
Player ChairUser = Global.ObjAccessor.GetPlayer(this, slot.Value); Unit chairUser = Global.ObjAccessor.GetUnit(this, sittingUnit);
if (ChairUser != null) if (chairUser != null)
if (ChairUser.IsSitState() && ChairUser.GetStandState() != UnitStandStateType.Sit && ChairUser.GetExactDist2d(x_i, y_i) < 0.1f) {
if (chairUser.IsSitState() && chairUser.GetStandState() != UnitStandStateType.Sit && chairUser.GetExactDist2d(x_i, y_i) < 0.1f)
continue; // This seat is already occupied by ChairUser. NOTE: Not sure if the ChairUser.getStandState() != UNIT_STAND_STATE_SIT check is required. continue; // This seat is already occupied by ChairUser. NOTE: Not sure if the ChairUser.getStandState() != UNIT_STAND_STATE_SIT check is required.
else
ChairListSlots[slot.Key] = default; // This seat is unoccupied. ChairListSlots[slot].Clear(); // This seat is unoccupied.
}
else else
ChairListSlots[slot.Key] = default; // The seat may of had an occupant, but they're offline. ChairListSlots[slot].Clear(); // The seat may of had an occupant, but they're offline.
} }
found_free_slot = true; found_free_slot = true;
// calculate the distance between the player and this slot // calculate the distance between the player and this slot
float thisDistance = player.GetDistance2d(x_i, y_i); float thisDistance = user.GetDistance2d(x_i, y_i);
if (thisDistance <= lowestDist) if (thisDistance <= lowestDist)
{ {
nearest_slot = slot.Key; nearest_slot = slot;
lowestDist = thisDistance; lowestDist = thisDistance;
x_lowest = x_i; x_lowest = x_i;
y_lowest = y_i; y_lowest = y_i;
@@ -1734,16 +1729,14 @@ namespace Game.Entities
var guid = ChairListSlots.LookupByKey(nearest_slot); var guid = ChairListSlots.LookupByKey(nearest_slot);
if (guid.IsEmpty()) if (guid.IsEmpty())
{ {
ChairListSlots[nearest_slot] = player.GetGUID(); //this slot in now used by player ChairListSlots[nearest_slot] = user.GetGUID(); //this slot in now used by player
player.TeleportTo(GetMapId(), x_lowest, y_lowest, GetPositionZ(), GetOrientation(), (TeleportToOptions.NotLeaveTransport | TeleportToOptions.NotLeaveCombat | TeleportToOptions.NotUnSummonPet)); user.NearTeleportTo(x_lowest, y_lowest, GetPositionZ(), GetOrientation());
player.SetStandState(UnitStandStateType.SitLowChair + (byte)info.Chair.chairheight); user.SetStandState(UnitStandStateType.SitLowChair + (byte)info.Chair.chairheight);
if (info.Chair.triggeredEvent != 0) if (info.Chair.triggeredEvent != 0)
GameEvents.Trigger(info.Chair.triggeredEvent, player, this); GameEvents.Trigger(info.Chair.triggeredEvent, user, this);
return; return;
} }
} }
else
player.GetSession().SendNotification("There's nowhere left for you to sit.");
return; return;
} }