Revert "Revert "fix: rename id1 to id for AzerothCore compatibility (#77)" (#78)"

Nyeriah · web-flow · commit 658292290baa · 2026-03-23T19:17:25.000-03:00
This reverts commit fd083d0.
diff --git a/src/mod_guildhouse.cpp b/src/mod_guildhouse.cpp
@@ -78,7 +78,7 @@ class GuildHelper : public GuildScript
                 uint32 lowguid = fields[0].Get<int32>();
                 if (CreatureData const* cr_data = sObjectMgr->GetCreatureData(lowguid))
                 {
-                    if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id1, lowguid)))
+                    if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id, lowguid)))
                     {
                         creature->CombatStop();
                         creature->DeleteFromDB();
@@ -278,7 +278,7 @@ class GuildHouseSeller : public CreatureScript
                 uint32 lowguid = fields[0].Get<uint32>();
                 if (CreatureData const* cr_data = sObjectMgr->GetCreatureData(lowguid))
                 {
-                    if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id1, lowguid)))
+                    if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id, lowguid)))
                     {
                         creature->CombatStop();
                         creature->DeleteFromDB();

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ class GuildHelper : public GuildScript`
`78`	`78`	`uint32 lowguid = fields[0].Get<int32>();`
`79`	`79`	`if (CreatureData const* cr_data = sObjectMgr->GetCreatureData(lowguid))`
`80`	`80`	`{`
`81`		`- if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id1, lowguid)))`
	`81`	`+ if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id, lowguid)))`
`82`	`82`	`{`
`83`	`83`	`creature->CombatStop();`
`84`	`84`	`creature->DeleteFromDB();`
`@@ -278,7 +278,7 @@ class GuildHouseSeller : public CreatureScript`
`278`	`278`	`uint32 lowguid = fields[0].Get<uint32>();`
`279`	`279`	`if (CreatureData const* cr_data = sObjectMgr->GetCreatureData(lowguid))`
`280`	`280`	`{`
`281`		`- if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id1, lowguid)))`
	`281`	`+ if (Creature* creature = map->GetCreature(ObjectGuid::Create<HighGuid::Unit>(cr_data->id, lowguid)))`
`282`	`282`	`{`
`283`	`283`	`creature->CombatStop();`
`284`	`284`	`creature->DeleteFromDB();`