Skip to content

Commit d21f6dd

Browse files
authored
Core/GameObjects: Fix crash with FishingHole gameobjects that have minSuccessOpens > maxSuccessOpens in gameobject_template (#31718)
1 parent 0075b9b commit d21f6dd

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/server/game/Entities/GameObject/GameObject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
343343
{
344344
case GAMEOBJECT_TYPE_FISHINGHOLE:
345345
SetGoAnimProgress(animprogress);
346-
m_goValue.FishingHole.MaxOpens = urand(GetGOInfo()->fishinghole.minSuccessOpens, GetGOInfo()->fishinghole.maxSuccessOpens);
346+
m_goValue.FishingHole.MaxOpens = urand(GetGOInfo()->fishinghole.minSuccessOpens, std::max(GetGOInfo()->fishinghole.minSuccessOpens, GetGOInfo()->fishinghole.maxSuccessOpens));
347347
break;
348348
case GAMEOBJECT_TYPE_DESTRUCTIBLE_BUILDING:
349349
m_goValue.Building.Health = goinfo->building.intactNumHits + goinfo->building.damagedNumHits;
@@ -615,7 +615,7 @@ void GameObject::Update(uint32 diff)
615615
break;
616616
case GAMEOBJECT_TYPE_FISHINGHOLE:
617617
// Initialize a new max fish count on respawn
618-
m_goValue.FishingHole.MaxOpens = urand(GetGOInfo()->fishinghole.minSuccessOpens, GetGOInfo()->fishinghole.maxSuccessOpens);
618+
m_goValue.FishingHole.MaxOpens = urand(GetGOInfo()->fishinghole.minSuccessOpens, std::max(GetGOInfo()->fishinghole.minSuccessOpens, GetGOInfo()->fishinghole.maxSuccessOpens));
619619
break;
620620
default:
621621
break;

0 commit comments

Comments
 (0)