server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Cleanup] Fixed up trailing spaces identified by github actions

Browse Source
This commit is contained in:
Antz 2021-03-08 10:15:11 +00:00 committed by Antz
parent 80278bf47b
commit b7fcab8603
No known key found for this signature in database
GPG Key ID: 0DF907270598C85F
24 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/ChatCommands/CastAndAuraCommands.cpp
View File

@ -368,7 +368,7 @@ bool ChatHandler::HandleAuraGroupCommand(char* args)
return true;
}
}
else
else
{
// Apply to all members of the group
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
@ -401,9 +401,9 @@ bool ChatHandler::HandleAuraGroupCommand(char* args)
bool ChatHandler::HandleUnAuraGroupCommand(char* args)
{
// Must have args : spellId or "all"
// Must have args : spellId or "all"
if(!*args)
{
{
return false;
}
@ -471,7 +471,7 @@ bool ChatHandler::HandleUnAuraGroupCommand(char* args)
playerTarget->RemoveAurasDueToSpell(spellIdToRemove);
PSendSysMessage(LANG_COMMAND_AURAGROUP_AURA_REMOVED_FOR_SPELL, spellIdToRemove, nameLink.c_str());
}
return true;
}
}

8
src/game/ChatCommands/GMCommands.cpp
View File

@ -438,7 +438,7 @@ bool freezePlayer(Player* player, WorldObject* caster)
// Internal shortcut function to freeze a player
void unFreezePlayer(Player* player)
{
player->RemoveAurasDueToSpell(SPELL_GM_FREEZE);
player->RemoveAurasDueToSpell(SPELL_GM_FREEZE);
}
@ -458,7 +458,7 @@ bool ChatHandler::HandleFreezePlayerCommand(char* args)
return false;
}
}
// 2. If arg is empty, gets the current selected target (returns current player if no unit selected)
if (!targetPlayer)
{
@ -487,7 +487,7 @@ bool ChatHandler::HandleFreezePlayerCommand(char* args)
}
// Check if target can be freezed
if (targetPlayer->GetSession()->GetSecurity() > m_session->GetSecurity())
if (targetPlayer->GetSession()->GetSecurity() > m_session->GetSecurity())
{
PSendSysMessage(LANG_COMMAND_FREEZE_PLAYER_CANNOT_FREEZE_HIGHER_SECLEVEL, targetName);
SetSentErrorMessage(true);
@ -498,7 +498,7 @@ bool ChatHandler::HandleFreezePlayerCommand(char* args)
// Notif GM
PSendSysMessage(LANG_COMMAND_FREEZE_PLAYER, targetName);
// Send message to player to prevent he has been frozen
ChatHandler(targetPlayer).SendSysMessage(LANG_COMMAND_FREEZE_PLAYER_YOU_HAVE_BEEN_FROZEN);

2
src/game/ChatCommands/GMTicketCommands.cpp
View File

@ -586,7 +586,7 @@ bool ChatHandler::HandleTickerSurveyClose(char* args)
return false;
}
}
uint32 ticketId = ticket->GetId();
ticket->CloseWithSurvey();

34
src/game/ChatCommands/PlayerMiscCommands.cpp
View File

@ -260,7 +260,7 @@ bool ChatHandler::HandleResetAllCommand(char* args)
int GetResetItemsBitMask(char* args)
{
int optionsBitMask = RESET_ITEMS_COMMAND_FLAG_OPTION_NONE;
if (strncmp(args, RESET_ITEMS_COMMAND_ARG_OPTION_EQUIPED, strlen(args)) == 0)
{
optionsBitMask |= RESET_ITEMS_COMMAND_FLAG_OPTION_EQUIPED;
@ -304,12 +304,12 @@ int GetResetItemsBitMask(char* args)
{
optionsBitMask |= RESET_ITEMS_COMMAND_FLAG_OPTION_ALL_BAGS;
}
else
else
{
return RESET_ITEMS_COMMAND_FLAG_OPTION_NONE;
}
}
return optionsBitMask;
}
@ -325,7 +325,7 @@ bool ChatHandler::HandleResetItemsCommand(char* args)
// Define all boolean by analysing args
int optionBitMask = GetResetItemsBitMask(args);
if (optionBitMask == RESET_ITEMS_COMMAND_FLAG_OPTION_NONE)
{
return false;
@ -348,7 +348,7 @@ bool ChatHandler::HandleResetItemsCommand(char* args)
for (int i = EQUIPMENT_SLOT_START; i < EQUIPMENT_SLOT_END; ++i)
{
if (Item* pItem = player->GetItemByPos(INVENTORY_SLOT_BAG_0, i))
{
{
if (pItem->GetEntry() == EARTH_STONE_ITEM)
{
// Do not delete earthstone
@ -483,18 +483,18 @@ bool ChatHandler::HandleResetItemsCommand(char* args)
}
player->DestroyItem(INVENTORY_SLOT_BAG_0, i, true);
++count;
}
}
}
PSendSysMessage(LANG_COMMAND_RESET_ITEMS_BUYBACK, count, player->GetName());
break;
}
}
// Perhaps check if we have deleted earthstone if, so then re-add it
// Perhaps check if we have deleted earthstone if, so then re-add it
}
// Since bitmaskorepation is "AND" we have to manually test the last cases
// Since bitmaskorepation is "AND" we have to manually test the last cases
if (optionBitMask == RESET_ITEMS_COMMAND_FLAG_OPTION_ALL)
{
// Just text display
@ -540,7 +540,7 @@ int GetResetMailBitMask(char* args)
if (args == NULL)
{
return optionBitMask;
}
}
if (strncmp(args, RESET_MAIL_COMMAND_ARG_OPTION_COD, strlen(args)) == 0)
{
@ -570,8 +570,8 @@ int GetResetMailBitMask(char* args)
return optionBitMask;
}
/*
HandleResetMailCommand
/*
HandleResetMailCommand
Default behaviour :
-------------------
- delete checked mails (even if its is GM stationery and if it contains items in it, but not deleted COD)
@ -606,7 +606,7 @@ bool ChatHandler::HandleResetMailCommand(char* args)
uint8 deletedCODMailCount = 0;
uint8 deletedFromMailCount = 0;
// Special chack if amil delete "from"
// Special chack if amil delete "from"
// in order to retrieve player
uint32 senderGuid = -1;
std::string from_sender_name;
@ -618,7 +618,7 @@ bool ChatHandler::HandleResetMailCommand(char* args)
uint32 playerGuid = 0;
Player* sender;
ObjectGuid from_sender_guid;
if (!ExtractPlayerTarget(&args, &sender, &from_sender_guid, &from_sender_name))
{
SendSysMessage(LANG_PLAYER_NOT_FOUND);
@ -632,10 +632,10 @@ bool ChatHandler::HandleResetMailCommand(char* args)
{
// Flag the mail as "deleted"
Mail* m = (*itr);
bool deleteMail = false;
// DO not use the swith because it begins at 1
// DO not use the swith because it begins at 1
if (optionBitMask == RESET_MAIL_COMMAND_FLAG_OPTION_NONE)
{
if (m->checked && !m->COD && m->state != MAIL_STATE_DELETED)
@ -724,7 +724,7 @@ bool ChatHandler::HandleResetMailCommand(char* args)
if (gm != player)
{
ChatHandler(player).PSendSysMessage(LANG_COMMAND_RESET_MAIL_PLAYER_NOTIF, m_session->GetPlayer()->GetName(), totalDeletedMailCount);
}
}
PSendSysMessage(LANG_COMMAND_RESET_MAIL_RECAP, totalDeletedMailCount, player->GetName());
return true;

4
src/game/ChatCommands/TeleportationAndPositionCommands.cpp
View File

@ -1120,7 +1120,7 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
}
data = sObjectMgr.GetCreatureData(lowguid);
if (!data)
{
SendSysMessage(LANG_COMMAND_GOCREATNOTFOUND);
@ -1204,7 +1204,7 @@ bool ChatHandler::HandleGoCreatureCommand(char* args)
{
// Go to creature initial pos to be on teh right Map
HandleGoHelper(_player, data->mapid, data->posX, data->posY, data->posZ);
// Inform player that he will need to make the command another time to go directly to the NPC
PSendSysMessage(LANG_COMMAND_EXECUTE_GOCRE_ANOTHER_TIME, targetMobGuid.GetCounter());
}

2
src/game/ChatCommands/ZZZ_CustomCommands.cpp
View File

@ -21,7 +21,7 @@
* World of Warcraft, and all World of Warcraft or Warcraft art, images,
* and lore are copyrighted by Blizzard Entertainment, Inc.
*/
/*
CUSTOM COMMANDS HANDLERS
Code your custom command handlers here !

6
src/game/Object/GMTicketMgr.cpp
View File

@ -91,7 +91,7 @@ void GMTicket::SetText(const char* text)
void GMTicket::SetResponseText(const char* text)
{
m_responseText = text ? text : "";
// Perform action in DB only if text is not empty
if (m_responseText != "")
{
@ -102,7 +102,7 @@ void GMTicket::SetResponseText(const char* text)
CharacterDatabase.PExecute("UPDATE `character_ticket` SET `response_text` = '%s' "
"WHERE `guid` = '%u' and `ticket_id` = %u",
escapedString.c_str(), m_guid.GetCounter(), m_ticketId);
}
}
}
void GMTicket::CloseWithSurvey() const
@ -195,7 +195,7 @@ void GMTicketMgr::Create(ObjectGuid guid, const char* text)
guid.GetCounter(), escapedText.c_str());
// Get the id of the ticket, needed for logging whispers
// Limiting to the the most recent ticket of the player and avoid potential multiple returns
// Limiting to the the most recent ticket of the player and avoid potential multiple returns
// if there is inconsistent data in table (e.g : more than 1 ticket unsolved for the same player (should never happen but..who knows..)
QueryResult* result = CharacterDatabase.PQuery("SELECT `ticket_id`, `guid`, `resolved` "
"FROM `character_ticket` "

14
src/game/Object/GameObject.cpp
View File

@ -412,7 +412,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
// traps can have time and can not have
GameObjectInfo const* goInfo = GetGOInfo();
uint32 max_charges = goInfo->GetCharges();
if (goInfo->type == GAMEOBJECT_TYPE_TRAP) // traps
@ -464,7 +464,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
{
useTrap = false;
}
if(useTrap)
{
Use(targetUnit);
@ -473,7 +473,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
}
}
// Only despawn object if there are charges to "consume"
// Only despawn object if there are charges to "consume"
// it means (all GO with charges = 0 in DB should never be despawned)
// Check : https://www.getmangos.eu/wiki/referenceinfo/dbinfo/mangosdb/mangoszeroworlddb/gameobject_template-r1047
// for more information about charges field in db depending on object type
@ -708,7 +708,7 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
AI()->UpdateAI(update_diff); // AI not react good at real update delays (while freeze in non-active part of map)
m_AI_locked = false;
}
}
void GameObject::Refresh()
@ -1043,9 +1043,9 @@ bool GameObject::IsVisibleForInState(Player const* u, WorldObject const* viewPoi
visibleDistance = GetGOInfo()->trap.radius + INTERACTION_DISTANCE;
}
}
}
case GAMEOBJECT_TYPE_SPELL_FOCUS:
{
if (GetGOInfo()->spellFocus.serverOnly == 1)
@ -2817,7 +2817,7 @@ bool GameObject::AIM_Initialize()
DEBUG_FILTER_LOG(LOG_FILTER_AI_AND_MOVEGENSS, "AIM_Initialize: failed to init, locked.");
return false;
}
m_AI.reset(sScriptMgr.GetGameObjectAI(this));
return true;

6
src/game/Object/GameObject.h
View File

@ -555,7 +555,7 @@ struct GameObjectDisplayInfoEntry;
class GameObject : public WorldObject
{
public:
explicit GameObject();
~GameObject();
@ -766,7 +766,7 @@ class GameObject : public WorldObject
void StopGroupLoot() override;
ObjectGuid m_lootRecipientGuid; // player who will have rights for looting if m_lootGroupRecipient==0 or group disbanded
uint32 m_lootGroupRecipientId; // group who will have rights for looting if set and exist
// Used for trap type
time_t m_rearmTimer; // timer to rearm the trap once disarmed
@ -774,7 +774,7 @@ class GameObject : public WorldObject
bool m_isInUse; // only one player at time are allowed to open chest
time_t m_reStockTimer; // timer to refill the chest
time_t m_despawnTimer; // timer to despawn the chest if something changed in it
bool m_AI_locked;
std::unique_ptr<GameObjectAI> m_AI;

6
src/game/Object/Player.cpp
View File

@ -4676,7 +4676,7 @@ void Player::SetLevitate(bool /*enable*/)
void Player::SetCanFly(bool enable)
{
// TODO: check if there is something similar for 1.12.x (99% chance there is not)
if (enable)
if (enable)
{
m_movementInfo.SetMovementFlags((MovementFlags)(MOVEFLAG_LEVITATING | MOVEFLAG_SWIMMING | MOVEFLAG_CAN_FLY | MOVEFLAG_FLYING));
}
@ -4684,7 +4684,7 @@ void Player::SetCanFly(bool enable)
{
m_movementInfo.SetMovementFlags(MOVEFLAG_NONE);
}
SendHeartBeat();
}
@ -9546,7 +9546,7 @@ Item* Player::GetItemByPos(uint16 pos) const
Item* Player::GetItemByPos(uint8 bag, uint8 slot) const
{
if ( bag == INVENTORY_SLOT_BAG_0 &&
if ( bag == INVENTORY_SLOT_BAG_0 &&
(slot < BANK_SLOT_BAG_END || // Equiped, Default Bagpack Inventory, Default Bank SLots
slot >= BUYBACK_SLOT_START
)

4
src/game/Object/Player.h
View File

@ -552,7 +552,7 @@ enum EquipmentSlots // 19 slots
enum InventorySlots // 4 slots
{
INVENTORY_SLOT_BAG_START = 19,
INVENTORY_SLOT_BAG_END = 23
INVENTORY_SLOT_BAG_END = 23
};
enum InventoryPackSlots // 16 slots
@ -2453,7 +2453,7 @@ class Player : public Unit
void _SaveAuras();
void _SaveInventory();
void _SaveHonorCP();
void _SaveQuestStatus();
void _SaveSkills();
void _SaveSpells();

2
src/game/Server/SharedDefines.h
View File

@ -2620,7 +2620,7 @@ enum CreatureEntriesConsts
CREATURE_GLUTINOUS_OOZE = 6559,
};
enum SpellEntriesConsts
enum SpellEntriesConsts
{
SPELL_FILLING_EMPTY_JAR__CURSED_OOZE = 15698,
SPELL_FILLING_EMPTY_JAR__TAINTED_OOZE = 15699,

18
src/game/Tools/PlayerDump.cpp
View File

@ -374,7 +374,7 @@ void PlayerDumpWriter::DumpTableContent(std::string& dump, uint32 guid, char con
wherestr = GenerateWhereStr(fieldname, guid);
}
//fetch table columns
//fetch table columns
std::string tableColumnNamesStr = "";
QueryNamedResult* resNames = CharacterDatabase.PQueryNamed("SELECT * FROM `%s` LIMIT 1", tableFrom);
if (!resNames)
@ -437,16 +437,16 @@ std::string PlayerDumpWriter::GetDump(uint32 guid)
dump += "IMPORTANT NOTE: NOT APPLY ITS DIRECTLY to character DB or you will DAMAGE and CORRUPT character DB\n";
// revision check guard
// Check the revision of character DB which will be the first line of the whole version/structure set
// Check the revision of character DB which will be the first line of the whole version/structure set
QueryResult* result = CharacterDatabase.Query("SELECT `version`, `structure`, `description`, `comment` FROM `db_version` ORDER BY `version` DESC, `structure` DESC, `content` ASC LIMIT 1");
if (result)
{
Field* fields = result->Fetch();
dump += "DUMPED_WITH:"+std::to_string(fields[0].GetInt16())
dump += "DUMPED_WITH:"+std::to_string(fields[0].GetInt16())
+ "." + std::to_string(fields[1].GetInt16()) + ".X "
+" CHAR. DB VERSION ( "
+" CHAR. DB VERSION ( "
+ fields[2].GetCppString() + " / "
+ fields[3].GetCppString() +
")\n\n"
@ -605,7 +605,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
size_t dbversionLen = dbversion.size();
std::string dbversionInDumpFile = line.substr(nw_pos+12, dbversionLen);
delete result;
if (dbversionInDumpFile != dbversion)
@ -613,7 +613,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
sLog.outError("LoadPlayerDump: Cannot load player dump - file version is %s, DB needs %s", dbversionInDumpFile.c_str(), dbversion.c_str());
ROLLBACK(DUMP_DB_VERSION_MISMATCH);
}
else
else
{
continue;
}
@ -621,7 +621,7 @@ DumpReturn PlayerDumpReader::LoadDump(const std::string& file, uint32 account, s
}
}
// determine table name and load type
std::string tn = gettablename(line);

2
src/game/WorldHandlers/AccountMgr.cpp
View File

@ -50,7 +50,7 @@ AccountOpResult AccountMgr::CreateAccount(std::string username, std::string pass
if (utf8length(password) > MAX_PASSWORD_STR)
{
return AOR_PASS_TOO_LONG; // password too long
return AOR_PASS_TOO_LONG; // password too long
}
normalizeString(username);

4
src/game/WorldHandlers/Chat.h
View File

@ -126,9 +126,9 @@ enum ResetItemCommandArgFlags
RESET_ITEMS_COMMAND_FLAG_OPTION_BANK = 0x04,
RESET_ITEMS_COMMAND_FLAG_OPTION_KEYRING = 0x08,
RESET_ITEMS_COMMAND_FLAG_OPTION_BUYBACK = 0x10,
RESET_ITEMS_COMMAND_FLAG_OPTION_ALL =
RESET_ITEMS_COMMAND_FLAG_OPTION_ALL =
(
RESET_ITEMS_COMMAND_FLAG_OPTION_EQUIPED
RESET_ITEMS_COMMAND_FLAG_OPTION_EQUIPED
| RESET_ITEMS_COMMAND_FLAG_OPTION_BAGS
| RESET_ITEMS_COMMAND_FLAG_OPTION_BANK
| RESET_ITEMS_COMMAND_FLAG_OPTION_KEYRING

6
src/mangosd/WorldThread.cpp
View File

@ -39,9 +39,9 @@
#include <chrono>
#include <thread>
#ifdef ENABLE_ELUNA
#include "LuaEngine.h"
#endif /* ENABLE_ELUNA */
#ifdef ENABLE_ELUNA
#include "LuaEngine.h"
#endif /* ENABLE_ELUNA */
#define WORLD_SLEEP_CONST 50

2
src/modules/Bots/playerbot/strategy/actions/ListSpellsAction.cpp
View File

@ -26,7 +26,7 @@ bool ListSpellsAction::Execute(Event event)
for (PlayerSpellMap::iterator itr = bot->GetSpellMap().begin(); itr != bot->GetSpellMap().end(); ++itr)
{
const uint32 spellId = itr->first;
if (itr->second.state == PLAYERSPELL_REMOVED || itr->second.disabled || IsPassiveSpell(spellId))
{
continue;

2
src/modules/Bots/playerbot/strategy/values/RtiTargetValue.h
View File

@ -14,7 +14,7 @@ namespace ai
{
int index = -1;
if(rti == "star")
{
{
index = 0;
}
else if(rti == "circle")

2
src/modules/Eluna

@ -1 +1 @@
Subproject commit d3a68a29ef30e18953223ad8bc6337a60a2b7bf7
Subproject commit 907d2720e91eca4069187b1e62bd300bdfe91c6a

2
src/modules/SD3

@ -1 +1 @@
Subproject commit 47cbde362f5886dc6a19735856276b1d9a00e660
Subproject commit 9a242436f7c89f4231d72db2cc2ee09b22e43cf4

2
src/realmd

@ -1 +1 @@
Subproject commit c4a0ed9d19a928a32a99085c4e8a6f68856e1d93
Subproject commit b9db17b2ec8ea9b268cea3005bf36aa8d6476047

8
src/shared/Database/Database.cpp
View File

@ -555,7 +555,7 @@ void PrintYouNeedDatabaseVersionExpectedByCore(const DBVersion& core_db_requirem
bool Database::CheckDatabaseVersion(DatabaseTypes database)
{
const DBVersion& core_db_requirements = databaseVersions[database];
// Fetch the database version table information
QueryResult* result = Query("SELECT `version`, `structure`, `content`, `description` FROM `db_version` ORDER BY `version` DESC, `structure` DESC, `content` DESC LIMIT 1");
@ -601,7 +601,7 @@ bool Database::CheckDatabaseVersion(DatabaseTypes database)
// DB is not up to date, but structure is correct.
// The 'content' version in the 'db_version' table can be < from the one required by the core
// See enum values for :
// WORLD_DB_CONTENT_NR
// WORLD_DB_CONTENT_NR
// CHAR_DB_CONTENT_NR
// REALMD_DB_CONTENT_NR
// for more information.
@ -618,14 +618,14 @@ bool Database::CheckDatabaseVersion(DatabaseTypes database)
// Else if the 'content' version in the 'db_version' table is > to the on expected by the core
else if (current_db_content > core_db_requirements.minimal_expected_content)
{
// TODO : Should not display with error color but warning (e.g YELLOW) => Create a sLog.outWarningDb() and sLog.outWarning()
// TODO : Should not display with error color but warning (e.g YELLOW) => Create a sLog.outWarningDb() and sLog.outWarning()
sLog.outErrorDb("You have content updates beyond the expected core version.");
sLog.outErrorDb("Check if the core you are running is built from the latest sources.");
sLog.outErrorDb("If so, DO NOT PANIC ! This message will disappear when the next DB Roll-Up will be released.");
db_vs_core_content_version_mismatch = true;
};
// In anys cases if there are differences in content : output a recap of the differences :
// In anys cases if there are differences in content : output a recap of the differences :
if (db_vs_core_content_version_mismatch)
{
// TODO : Should not display with error color but warning (e.g YELLOW) => Create a sLog.outWarningDb() and sLog.outWarning()

2
src/shared/Utilities/Timer.h
View File

@ -63,7 +63,7 @@ inline uint32 getMSTimeDiff(uint32 oldMSTime, std::chrono::steady_clock::time_po
using namespace std::chrono;
uint32 newMSTime = uint32(duration_cast<milliseconds>(newTime - GetApplicationStartTime()).count());
return getMSTimeDiff(oldMSTime, newMSTime);
}

2
src/tools/Extractor_projects

@ -1 +1 @@
Subproject commit 5d81c3d6c36e7e7e00a9fbd73c0a56439703f9b6
Subproject commit f225ecec208f659b927cd578f3589174561b82a4