diff --git a/CMangos/GroupMethods.h b/CMangos/GroupMethods.h
index 89699f7009..c0b5df41a3 100644
--- a/CMangos/GroupMethods.h
+++ b/CMangos/GroupMethods.h
@@ -378,7 +378,7 @@ namespace LuaGroup
     ElunaRegister<Group> GroupMethods[] =
     {
         // Getters
-        { "GetMembers", &LuaGroup::GetMembers },
+        { "GetMembers", &LuaGroup::GetMembers, METHOD_REG_WORLD }, // World state method only in multistate
         { "GetLeaderGUID", &LuaGroup::GetLeaderGUID },
         { "GetGUID", &LuaGroup::GetGUID },
         { "GetMemberGroup", &LuaGroup::GetMemberGroup },
@@ -386,15 +386,15 @@ namespace LuaGroup
         { "GetMembersCount", &LuaGroup::GetMembersCount },
 
         // Setters
-        { "SetLeader", &LuaGroup::SetLeader },
-        { "SetMembersGroup", &LuaGroup::SetMembersGroup },
-        { "SetTargetIcon", &LuaGroup::SetTargetIcon },
+        { "SetLeader", &LuaGroup::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetMembersGroup", &LuaGroup::SetMembersGroup, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetTargetIcon", &LuaGroup::SetTargetIcon, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Boolean
         { "IsLeader", &LuaGroup::IsLeader },
-        { "AddMember", &LuaGroup::AddMember },
-        { "RemoveMember", &LuaGroup::RemoveMember },
-        { "Disband", &LuaGroup::Disband },
+        { "AddMember", &LuaGroup::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "RemoveMember", &LuaGroup::RemoveMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "Disband", &LuaGroup::Disband, METHOD_REG_WORLD }, // World state method only in multistate
         { "IsFull", &LuaGroup::IsFull },
         { "IsRaidGroup", &LuaGroup::IsRaidGroup },
         { "IsBGGroup", &LuaGroup::IsBGGroup },
@@ -410,7 +410,7 @@ namespace LuaGroup
 
         // Other
         { "SendPacket", &LuaGroup::SendPacket },
-        { "ConvertToRaid", &LuaGroup::ConvertToRaid },
+        { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Not implemented methods
         { "IsBFGroup", nullptr, METHOD_REG_NONE },   // not implemented
diff --git a/CMangos/GuildMethods.h b/CMangos/GuildMethods.h
index dc1e83a527..2338cc1735 100644
--- a/CMangos/GuildMethods.h
+++ b/CMangos/GuildMethods.h
@@ -242,8 +242,8 @@ namespace LuaGuild
     ElunaRegister<Guild> GuildMethods[] =
     {
         // Getters
-        { "GetMembers", &LuaGuild::GetMembers },
-        { "GetLeader", &LuaGuild::GetLeader },
+        { "GetMembers", &LuaGuild::GetMembers, METHOD_REG_WORLD }, // World state method only in multistate
+        { "GetLeader", &LuaGuild::GetLeader, METHOD_REG_WORLD }, // World state method only in multistate
         { "GetLeaderGUID", &LuaGuild::GetLeaderGUID },
         { "GetId", &LuaGuild::GetId },
         { "GetName", &LuaGuild::GetName },
@@ -253,13 +253,13 @@ namespace LuaGuild
 
         // Setters
 #if defined(TBC) || defined(WOTLK)
-        { "SetBankTabText", &LuaGuild::SetBankTabText },
+        { "SetBankTabText", &LuaGuild::SetBankTabText, METHOD_REG_WORLD }, // World state method only in multistate
 #else
         { "SetBankTabText", nullptr, METHOD_REG_NONE },
 #endif
-        { "SetMemberRank", &LuaGuild::SetMemberRank },
+        { "SetMemberRank", &LuaGuild::SetMemberRank, METHOD_REG_WORLD }, // World state method only in multistate
 #ifndef CATA
-        { "SetLeader", &LuaGuild::SetLeader },
+        { "SetLeader", &LuaGuild::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
 #else
         { "SetLeader", nullptr, METHOD_REG_NONE },
 #endif
@@ -267,9 +267,9 @@ namespace LuaGuild
         // Other
         { "SendPacket", &LuaGuild::SendPacket },
         { "SendPacketToRanked", &LuaGuild::SendPacketToRanked },
-        { "Disband", &LuaGuild::Disband },
-        { "AddMember", &LuaGuild::AddMember },
-        { "DeleteMember", &LuaGuild::DeleteMember },
+        { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate
+        { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate
 
         { NULL, NULL, METHOD_REG_NONE }
     };
diff --git a/CMangos/PlayerMethods.h b/CMangos/PlayerMethods.h
index 1017ef4431..eec0344685 100644
--- a/CMangos/PlayerMethods.h
+++ b/CMangos/PlayerMethods.h
@@ -4004,8 +4004,8 @@ namespace LuaPlayer
         { "Mute", &LuaPlayer::Mute },
         { "SummonPlayer", &LuaPlayer::SummonPlayer },
         { "SaveToDB", &LuaPlayer::SaveToDB },
-        { "GroupInvite", &LuaPlayer::GroupInvite },
-        { "GroupCreate", &LuaPlayer::GroupCreate },
+        { "GroupInvite", &LuaPlayer::GroupInvite, METHOD_REG_WORLD }, // World state method only in multistate
+        { "GroupCreate", &LuaPlayer::GroupCreate, METHOD_REG_WORLD }, // World state method only in multistate
         { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
 #if defined(TBC) || defined(WOTLK)
         { "RemoveArenaSpellCooldowns", &LuaPlayer::RemoveArenaSpellCooldowns },
diff --git a/Mangos/GroupMethods.h b/Mangos/GroupMethods.h
index 796cd1ca16..86e25d0f94 100644
--- a/Mangos/GroupMethods.h
+++ b/Mangos/GroupMethods.h
@@ -382,15 +382,15 @@ namespace LuaGroup
         { "GetMembersCount", &LuaGroup::GetMembersCount },
 
         // Setters
-        { "SetLeader", &LuaGroup::SetLeader },
-        { "SetMembersGroup", &LuaGroup::SetMembersGroup },
-        { "SetTargetIcon", &LuaGroup::SetTargetIcon },
+        { "SetLeader", &LuaGroup::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetMembersGroup", &LuaGroup::SetMembersGroup, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetTargetIcon", &LuaGroup::SetTargetIcon, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Boolean
         { "IsLeader", &LuaGroup::IsLeader },
-        { "AddMember", &LuaGroup::AddMember },
-        { "RemoveMember", &LuaGroup::RemoveMember },
-        { "Disband", &LuaGroup::Disband },
+        { "AddMember", &LuaGroup::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "RemoveMember", &LuaGroup::RemoveMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "Disband", &LuaGroup::Disband, METHOD_REG_WORLD }, // World state method only in multistate
         { "IsFull", &LuaGroup::IsFull },
         { "IsRaidGroup", &LuaGroup::IsRaidGroup },
         { "IsBGGroup", &LuaGroup::IsBGGroup },
@@ -405,7 +405,7 @@ namespace LuaGroup
 #endif
         // Other
         { "SendPacket", &LuaGroup::SendPacket },
-        { "ConvertToRaid", &LuaGroup::ConvertToRaid },
+        { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Not implemented methods
         { "IsBFGroup", nullptr, METHOD_REG_NONE },   // not implemented
diff --git a/Mangos/GuildMethods.h b/Mangos/GuildMethods.h
index ec393d10d5..39c0421d83 100644
--- a/Mangos/GuildMethods.h
+++ b/Mangos/GuildMethods.h
@@ -246,10 +246,10 @@ namespace LuaGuild
         { "GetMemberCount", &LuaGuild::GetMemberCount },
 
         // Setters
-        { "SetMemberRank", &LuaGuild::SetMemberRank },
-        { "SetLeader", &LuaGuild::SetLeader },
+        { "SetMemberRank", &LuaGuild::SetMemberRank, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetLeader", &LuaGuild::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
 #ifndef CLASSIC
-        { "SetBankTabText", &LuaGuild::SetBankTabText },
+        { "SetBankTabText", &LuaGuild::SetBankTabText, METHOD_REG_WORLD }, // World state method only in multistate
 #else
         { "SetBankTabText", nullptr,  METHOD_REG_NONE},
 #endif
@@ -257,9 +257,9 @@ namespace LuaGuild
         // Other
         { "SendPacket", &LuaGuild::SendPacket },
         { "SendPacketToRanked", &LuaGuild::SendPacketToRanked },
-        { "Disband", &LuaGuild::Disband },
-        { "AddMember", &LuaGuild::AddMember },
-        { "DeleteMember", &LuaGuild::DeleteMember },
+        { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate
+        { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate
 
         { NULL, NULL, METHOD_REG_NONE }
     };
diff --git a/Mangos/PlayerMethods.h b/Mangos/PlayerMethods.h
index fde2adf88b..2280baaebe 100644
--- a/Mangos/PlayerMethods.h
+++ b/Mangos/PlayerMethods.h
@@ -3917,8 +3917,8 @@ namespace LuaPlayer
         { "Mute", &LuaPlayer::Mute },
         { "SummonPlayer", &LuaPlayer::SummonPlayer },
         { "SaveToDB", &LuaPlayer::SaveToDB },
-        { "GroupInvite", &LuaPlayer::GroupInvite },
-        { "GroupCreate", &LuaPlayer::GroupCreate },
+        { "GroupInvite", &LuaPlayer::GroupInvite, METHOD_REG_WORLD }, // World state method only in multistate
+        { "GroupCreate", &LuaPlayer::GroupCreate, METHOD_REG_WORLD }, // World state method only in multistate
         { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
 #if defined(CLASSIC)
         { "UpdateHonor", &LuaPlayer::UpdateHonor },
diff --git a/TrinityCore/GroupMethods.h b/TrinityCore/GroupMethods.h
index fdac6ea5e1..25c87af4bc 100644
--- a/TrinityCore/GroupMethods.h
+++ b/TrinityCore/GroupMethods.h
@@ -133,6 +133,8 @@ namespace LuaGroup
     /**
      * Adds a new member to the [Group]
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] player : [Player] to add to the group
      * @return bool added : true if member was added
      */
@@ -281,6 +283,8 @@ namespace LuaGroup
     /**
      * Sets the leader of this [Group]
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param ObjectGuid guid : guid of the new leader
      */
     int SetLeader(Eluna* E, Group* group)
@@ -311,6 +315,8 @@ namespace LuaGroup
     /**
      * Removes a [Player] from this [Group] and returns 'true' if successful
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * <pre>
      * enum RemoveMethod
      * {
@@ -337,6 +343,8 @@ namespace LuaGroup
     /**
      * Disbands this [Group]
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      */
     int Disband(Eluna* /*E*/, Group* group)
     {
@@ -347,6 +355,8 @@ namespace LuaGroup
     /**
      * Converts this [Group] to a raid [Group]
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      */
     int ConvertToRaid(Eluna* /*E*/, Group* group)
     {
@@ -357,6 +367,8 @@ namespace LuaGroup
     /**
      * Sets the member's subGroup
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param ObjectGuid guid : guid of the player to move
      * @param uint8 groupID : the subGroup's ID
      */
@@ -381,6 +393,8 @@ namespace LuaGroup
     /**
      * Sets the target icon of an object for the [Group]
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param uint8 icon : the icon (Skull, Square, etc)
      * @param ObjectGuid target : GUID of the icon target, 0 is to clear the icon
      * @param ObjectGuid setter : GUID of the icon setter
@@ -400,6 +414,9 @@ namespace LuaGroup
 
     /**
      * Converts the [Group] to a LFG group
+     *
+     * In multistate, this method is only available in the WORLD state
+     *
      */
     int ConvertToLFG(Eluna* /*E*/, Group* group)
     {
@@ -411,6 +428,8 @@ namespace LuaGroup
     /**
      * Sets or removes a flag for a [Group] member
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * <pre>
      * enum GroupMemberFlags
      * {
@@ -449,18 +468,18 @@ namespace LuaGroup
 #endif
 
         // Setters
-        { "SetLeader", &LuaGroup::SetLeader },
-        { "SetMembersGroup", &LuaGroup::SetMembersGroup },
-        { "SetTargetIcon", &LuaGroup::SetTargetIcon },
+        { "SetLeader", &LuaGroup::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetMembersGroup", &LuaGroup::SetMembersGroup, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetTargetIcon", &LuaGroup::SetTargetIcon, METHOD_REG_WORLD }, // World state method only in multistate
 #ifndef CATA
-        { "SetMemberFlag", &LuaGroup::SetMemberFlag },
+        { "SetMemberFlag", &LuaGroup::SetMemberFlag, METHOD_REG_WORLD }, // World state method only in multistate
 #endif
 
         // Boolean
         { "IsLeader", &LuaGroup::IsLeader },
-        { "AddMember", &LuaGroup::AddMember },
-        { "RemoveMember", &LuaGroup::RemoveMember },
-        { "Disband", &LuaGroup::Disband },
+        { "AddMember", &LuaGroup::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "RemoveMember", &LuaGroup::RemoveMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "Disband", &LuaGroup::Disband, METHOD_REG_WORLD }, // World state method only in multistate
         { "IsFull", &LuaGroup::IsFull },
         { "IsLFGGroup", &LuaGroup::IsLFGGroup },
         { "IsRaidGroup", &LuaGroup::IsRaidGroup },
@@ -473,8 +492,8 @@ namespace LuaGroup
 
         // Other
         { "SendPacket", &LuaGroup::SendPacket },
-        { "ConvertToLFG", &LuaGroup::ConvertToLFG },
-        { "ConvertToRaid", &LuaGroup::ConvertToRaid },
+        { "ConvertToLFG", &LuaGroup::ConvertToLFG, METHOD_REG_WORLD }, // World state method only in multistate
+        { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate
 
 #ifdef CATA //Not implemented in TCPP
         { "GetMemberFlags", nullptr, METHOD_REG_NONE },
diff --git a/TrinityCore/GuildMethods.h b/TrinityCore/GuildMethods.h
index 533e289389..fcd941593f 100644
--- a/TrinityCore/GuildMethods.h
+++ b/TrinityCore/GuildMethods.h
@@ -128,6 +128,8 @@ namespace LuaGuild
     /**
      * Sets the leader of this [Guild]
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] leader : the [Player] leader to change
      */
     int SetLeader(Eluna* E, Guild* guild)
@@ -142,6 +144,8 @@ namespace LuaGuild
     /**
      * Sets the information of the bank tab specified
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param uint8 tabId : the ID of the tab specified
      * @param string info : the information to be set to the bank tab
      */
@@ -186,6 +190,9 @@ namespace LuaGuild
 
     /**
      * Disbands the [Guild]
+     *
+     * In multistate, this method is only available in the WORLD state
+     *
      */
     int Disband(Eluna* /*E*/, Guild* guild)
     {
@@ -198,6 +205,8 @@ namespace LuaGuild
      *
      * If no rank is specified, defaults to none.
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] player : the [Player] to be added to the guild
      * @param uint8 rankId : the rank ID
      */
@@ -215,6 +224,8 @@ namespace LuaGuild
     /**
      * Removes the specified [Player] from the [Guild].
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] player : the [Player] to be removed from the guild
      * @param bool isDisbanding : default 'false', should only be set to 'true' if the guild is triggered to disband
      */
@@ -232,6 +243,8 @@ namespace LuaGuild
     /**
      * Promotes/demotes the [Player] to the specified rank.
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] player : the [Player] to be promoted/demoted
      * @param uint8 rankId : the rank ID
      */
@@ -259,18 +272,18 @@ namespace LuaGuild
         { "GetMemberCount", &LuaGuild::GetMemberCount },
 
         // Setters
-        { "SetBankTabText", &LuaGuild::SetBankTabText },
-        { "SetMemberRank", &LuaGuild::SetMemberRank },
+        { "SetBankTabText", &LuaGuild::SetBankTabText, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetMemberRank", &LuaGuild::SetMemberRank, METHOD_REG_WORLD }, // World state method only in multistate
 #ifndef CATA
-        { "SetLeader", &LuaGuild::SetLeader },
+        { "SetLeader", &LuaGuild::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
 #endif
 
         // Other
         { "SendPacket", &LuaGuild::SendPacket },
         { "SendPacketToRanked", &LuaGuild::SendPacketToRanked },
-        { "Disband", &LuaGuild::Disband },
-        { "AddMember", &LuaGuild::AddMember },
-        { "DeleteMember", &LuaGuild::DeleteMember },
+        { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate
+        { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate
 
 #ifdef CATA //Not implemented in TCPP
         { "SetLeader", nullptr, METHOD_REG_NONE },
diff --git a/TrinityCore/PlayerMethods.h b/TrinityCore/PlayerMethods.h
index d729a77da1..71d524b9fa 100644
--- a/TrinityCore/PlayerMethods.h
+++ b/TrinityCore/PlayerMethods.h
@@ -3589,6 +3589,8 @@ namespace LuaPlayer
     /**
      * Makes the [Player] invite another player to a group.
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] invited : player to invite to group
      * @return bool success : true if the player was invited to a group
      */
@@ -3645,6 +3647,8 @@ namespace LuaPlayer
     /**
      * Creates a new [Group] with the creator [Player] as leader.
      *
+     * In multistate, this method is only available in the WORLD state
+     *
      * @param [Player] invited : player to add to group
      * @return [Group] createdGroup : the created group or nil
      */
@@ -4074,8 +4078,8 @@ namespace LuaPlayer
         { "Mute", &LuaPlayer::Mute },
         { "SummonPlayer", &LuaPlayer::SummonPlayer },
         { "SaveToDB", &LuaPlayer::SaveToDB },
-        { "GroupInvite", &LuaPlayer::GroupInvite },
-        { "GroupCreate", &LuaPlayer::GroupCreate },
+        { "GroupInvite", &LuaPlayer::GroupInvite, METHOD_REG_WORLD }, // World state method only in multistate
+        { "GroupCreate", &LuaPlayer::GroupCreate, METHOD_REG_WORLD }, // World state method only in multistate
         { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
         { "SendMovieStart", &LuaPlayer::SendMovieStart },
 
diff --git a/VMangos/GroupMethods.h b/VMangos/GroupMethods.h
index 878a74489a..4ed139f551 100644
--- a/VMangos/GroupMethods.h
+++ b/VMangos/GroupMethods.h
@@ -353,7 +353,7 @@ namespace LuaGroup
     ElunaRegister<Group> GroupMethods[] =
     {
         // Getters
-        { "GetMembers", &LuaGroup::GetMembers },
+        { "GetMembers", &LuaGroup::GetMembers, METHOD_REG_WORLD }, // World state method only in multistate
         { "GetLeaderGUID", &LuaGroup::GetLeaderGUID },
         { "GetGUID", &LuaGroup::GetGUID },
         { "GetMemberGroup", &LuaGroup::GetMemberGroup },
@@ -361,15 +361,15 @@ namespace LuaGroup
         { "GetMembersCount", &LuaGroup::GetMembersCount },
 
         // Setters
-        { "SetLeader", &LuaGroup::SetLeader },
-        { "SetMembersGroup", &LuaGroup::SetMembersGroup },
-        { "SetTargetIcon", &LuaGroup::SetTargetIcon },
+        { "SetLeader", &LuaGroup::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetMembersGroup", &LuaGroup::SetMembersGroup, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetTargetIcon", &LuaGroup::SetTargetIcon, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Boolean
         { "IsLeader", &LuaGroup::IsLeader },
-        { "AddMember", &LuaGroup::AddMember },
-        { "RemoveMember", &LuaGroup::RemoveMember },
-        { "Disband", &LuaGroup::Disband },
+        { "AddMember", &LuaGroup::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "RemoveMember", &LuaGroup::RemoveMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "Disband", &LuaGroup::Disband, METHOD_REG_WORLD }, // World state method only in multistate
         { "IsFull", &LuaGroup::IsFull },
         { "IsRaidGroup", &LuaGroup::IsRaidGroup },
         { "IsBGGroup", &LuaGroup::IsBGGroup },
@@ -380,7 +380,7 @@ namespace LuaGroup
 
         // Other
         { "SendPacket", &LuaGroup::SendPacket },
-        { "ConvertToRaid", &LuaGroup::ConvertToRaid },
+        { "ConvertToRaid", &LuaGroup::ConvertToRaid, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Not implemented methods
         { "IsLFGGroup", nullptr, METHOD_REG_NONE },       // not implemented
diff --git a/VMangos/GuildMethods.h b/VMangos/GuildMethods.h
index 3610ca7e58..05cd108931 100644
--- a/VMangos/GuildMethods.h
+++ b/VMangos/GuildMethods.h
@@ -224,8 +224,8 @@ namespace LuaGuild
     ElunaRegister<Guild> GuildMethods[] =
     {
         // Getters
-        { "GetMembers", &LuaGuild::GetMembers },
-        { "GetLeader", &LuaGuild::GetLeader },
+        { "GetMembers", &LuaGuild::GetMembers, METHOD_REG_WORLD }, // World state method only in multistate
+        { "GetLeader", &LuaGuild::GetLeader, METHOD_REG_WORLD }, // World state method only in multistate
         { "GetLeaderGUID", &LuaGuild::GetLeaderGUID },
         { "GetId", &LuaGuild::GetId },
         { "GetName", &LuaGuild::GetName },
@@ -234,15 +234,15 @@ namespace LuaGuild
         { "GetMemberCount", &LuaGuild::GetMemberCount },
 
         // Setters
-        { "SetMemberRank", &LuaGuild::SetMemberRank },
-        { "SetLeader", &LuaGuild::SetLeader },
+        { "SetMemberRank", &LuaGuild::SetMemberRank, METHOD_REG_WORLD }, // World state method only in multistate
+        { "SetLeader", &LuaGuild::SetLeader, METHOD_REG_WORLD }, // World state method only in multistate
 
         // Other
         { "SendPacket", &LuaGuild::SendPacket },
         { "SendPacketToRanked", &LuaGuild::SendPacketToRanked },
-        { "Disband", &LuaGuild::Disband },
-        { "AddMember", &LuaGuild::AddMember },
-        { "DeleteMember", &LuaGuild::DeleteMember },
+        { "Disband", &LuaGuild::Disband, METHOD_REG_WORLD }, // World state method only in multistate
+        { "AddMember", &LuaGuild::AddMember, METHOD_REG_WORLD }, // World state method only in multistate
+        { "DeleteMember", &LuaGuild::DeleteMember, METHOD_REG_WORLD }, // World state method only in multistate
 
         { "SetBankTabText", nullptr, METHOD_REG_NONE }, // not implemented
 
diff --git a/VMangos/PlayerMethods.h b/VMangos/PlayerMethods.h
index 0097a33992..ee69149be1 100644
--- a/VMangos/PlayerMethods.h
+++ b/VMangos/PlayerMethods.h
@@ -4344,8 +4344,8 @@ namespace LuaPlayer
         { "Mute", &LuaPlayer::Mute },
         { "SummonPlayer", &LuaPlayer::SummonPlayer },
         { "SaveToDB", &LuaPlayer::SaveToDB },
-        { "GroupInvite", &LuaPlayer::GroupInvite },
-        { "GroupCreate", &LuaPlayer::GroupCreate },
+        { "GroupInvite", &LuaPlayer::GroupInvite, METHOD_REG_WORLD }, // World state method only in multistate
+        { "GroupCreate", &LuaPlayer::GroupCreate, METHOD_REG_WORLD }, // World state method only in multistate
         { "SendCinematicStart", &LuaPlayer::SendCinematicStart },
 #if defined(CLASSIC)
         { "UpdateHonor", &LuaPlayer::UpdateHonor },