From 203861ff8e7562293a06c811ce3f47e3205a5862 Mon Sep 17 00:00:00 2001
From: Xfurry <xfurry@scriptdev2.com>
Date: Tue, 8 Jul 2014 23:34:29 +0200
Subject: [PATCH] [3025] Disable AI attack for controllable vehicles. Requires
 CMaNGOS 12682+

Conflicts:
	sql/scriptdev2_script_full.sql
---
 include/sc_creature.cpp          | 3 +++
 sd2_revision_nr.h                | 2 +-
 sql/scriptdev2_script_full.sql   | 2 +-
 sql/updates/r3025_scriptdev2.sql | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 sql/updates/r3025_scriptdev2.sql

diff --git a/include/sc_creature.cpp b/include/sc_creature.cpp
index ff1864003..15b65c4ac 100644
--- a/include/sc_creature.cpp
+++ b/include/sc_creature.cpp
@@ -85,6 +85,9 @@ void ScriptedAI::MoveInLineOfSight(Unit* pWho)
  */
 void ScriptedAI::AttackStart(Unit* pWho)
 {
+    if (!pWho || !m_creature->CanAttackByItself())
+        return;
+
     if (pWho && m_creature->Attack(pWho, true))             // The Attack function also uses basic checks if pWho can be attacked
     {
         m_creature->AddThreat(pWho);
diff --git a/sd2_revision_nr.h b/sd2_revision_nr.h
index a6b979453..b62dd2293 100644
--- a/sd2_revision_nr.h
+++ b/sd2_revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __SD2_REVISION_NR_H__
 #define __SD2_REVISION_NR_H__
- #define SD2_REVISION_NR "3024"
+ #define SD2_REVISION_NR "3025"
 #endif // __SD2_REVISION_NR_H__
diff --git a/sql/scriptdev2_script_full.sql b/sql/scriptdev2_script_full.sql
index 68e537503..b60e0a3e4 100644
--- a/sql/scriptdev2_script_full.sql
+++ b/sql/scriptdev2_script_full.sql
@@ -3,7 +3,7 @@
 --
 
 DELETE FROM sd2_db_version;
-INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MangosR2 3157+ / for CMaNGOS 12674+) ');
+INSERT INTO sd2_db_version (version) VALUES ('ScriptDev2 (for MangosR2 3157+ / for CMaNGOS 12682+) ');
 
 --
 -- Below contains data for table `script_texts` mainly used in C++ parts.
diff --git a/sql/updates/r3025_scriptdev2.sql b/sql/updates/r3025_scriptdev2.sql
new file mode 100644
index 000000000..1aa4d2fb1
--- /dev/null
+++ b/sql/updates/r3025_scriptdev2.sql
@@ -0,0 +1 @@
+UPDATE sd2_db_version SET version='ScriptDev2 (for CMaNGOS 12682+) ';