Merge branch 'master' of https://github.com/TrinityCore/TrinityCore.git

Conflicts:
	src/server/game/Entities/Player/Player.cpp

2 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/Examples/example_creature.cpp b/src/server/scripts/Examples/example_creature.cpp
index d1ac2045e61..1a030728218 100644
--- a/src/server/scripts/Examples/example_creature.cpp
+++ b/src/server/scripts/Examples/example_creature.cpp
@@ -148,7 +148,7 @@ class example_creature : public CreatureScript
             {
                 me->HandleEmoteCommand(uiTextEmote);
 
-                switch(uiTextEmote)
+                switch (uiTextEmote)
                 {
                     case TEXT_EMOTE_DANCE:
                         DoScriptText(SAY_DANCE, me);
diff --git a/src/server/scripts/Examples/example_escort.cpp b/src/server/scripts/Examples/example_escort.cpp
index fa62563e25d..dfac4321a23 100644
--- a/src/server/scripts/Examples/example_escort.cpp
+++ b/src/server/scripts/Examples/example_escort.cpp
@@ -202,7 +202,7 @@ class example_escort : public CreatureScript
             player->PlayerTalkClass->ClearMenus();
             npc_escortAI* pEscortAI = CAST_AI(example_escort::example_escortAI, creature->AI());
 
-            switch(uiAction)
+            switch (uiAction)
             {
                 case GOSSIP_ACTION_INFO_DEF+1:
                     player->CLOSE_GOSSIP_MENU();