2 files changed, 81 insertions, 0 deletions
diff --git a/src/server/scripts/Draenor/Garrison/garrison_generic.cpp b/src/server/scripts/Draenor/Garrison/garrison_generic.cpp
new file mode 100644
index 00000000000..7b804e2aece
--- /dev/null
+++ b/src/server/scripts/Draenor/Garrison/garrison_generic.cpp
@@ -0,0 +1,79 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "AreaTrigger.h"
+#include "AreaTriggerAI.h"
+#include "Garrison.h"
+#include "Map.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+#include "Unit.h"
+
+// XX - Garrison enter AreaTrigger
+struct at_garrison_enter : AreaTriggerAI
+{
+    at_garrison_enter(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) { }
+
+    void OnInitialize() override
+    {
+        at->setActive(true); // has to be active, otherwise the at is no longer updated before we are able to leave it
+    }
+
+    void OnUnitEnter(Unit* unit) override
+    {
+        Player* player = unit->ToPlayer();
+        if (!player)
+            return;
+
+        Garrison* garrison = player->GetGarrison();
+        if (!garrison)
+            return;
+
+        garrison->Enter();
+    }
+};
+
+// XX - Garrison exit AreaTrigger
+struct at_garrison_exit : AreaTriggerAI
+{
+    at_garrison_exit(AreaTrigger* areatrigger) : AreaTriggerAI(areatrigger) { }
+
+    void OnInitialize() override
+    {
+        at->setActive(true); // has to be active, otherwise the at is no longer updated before we are able to leave it
+    }
+
+    void OnUnitExit(Unit* unit) override
+    {
+        Player* player = unit->ToPlayer();
+        if (!player)
+            return;
+
+        Garrison* garrison = player->GetGarrison();
+        if (!garrison)
+            return;
+
+        garrison->Leave();
+    }
+};
+
+void AddSC_garrison_generic()
+{
+    // AreaTrigger
+    RegisterAreaTriggerAI(at_garrison_enter);
+    RegisterAreaTriggerAI(at_garrison_exit);
+}
diff --git a/src/server/scripts/Draenor/draenor_script_loader.cpp b/src/server/scripts/Draenor/draenor_script_loader.cpp
index 2d8e1f17915..b913ee77253 100644
--- a/src/server/scripts/Draenor/draenor_script_loader.cpp
+++ b/src/server/scripts/Draenor/draenor_script_loader.cpp
@@ -18,6 +18,7 @@
  // This is where scripts' loading functions should be declared:
 void AddSC_assault_on_the_dark_portal();
 void AddSC_draenor_shadowmoon_valley();
+void AddSC_garrison_generic();
 
 // The name of this function should match:
 // void Add${NameOfDirectory}Scripts()
@@ -25,4 +26,5 @@ void AddDraenorScripts()
 {
     AddSC_assault_on_the_dark_portal();
     AddSC_draenor_shadowmoon_valley();
+    AddSC_garrison_generic();
 }