diff options
| -rw-r--r-- | contrib/registration_form/Expanded/index.php | 1 | ||||
| -rw-r--r-- | contrib/registration_form/simple/db.conf.php.dist | 18 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 6 |
3 files changed, 23 insertions, 2 deletions
diff --git a/contrib/registration_form/Expanded/index.php b/contrib/registration_form/Expanded/index.php index c3abef3bea6..e72ff87c148 100644 --- a/contrib/registration_form/Expanded/index.php +++ b/contrib/registration_form/Expanded/index.php @@ -164,6 +164,7 @@ if (!empty($_POST)) { $username = strtoupper($_POST["username"]); $password = strtoupper($_POST["password"]); $email = strtoupper($_POST["email"]); + $expansion = $_POST["expansion"]; if (strlen($username) < 5) { error_s("Username too short."); exit(); diff --git a/contrib/registration_form/simple/db.conf.php.dist b/contrib/registration_form/simple/db.conf.php.dist new file mode 100644 index 00000000000..05d0ee1e7b0 --- /dev/null +++ b/contrib/registration_form/simple/db.conf.php.dist @@ -0,0 +1,18 @@ +<?php + +// Configuration. +// Realm database. +$r_db = "realmd"; +// IP (and port). +$ip = "127.0.0.1:3306"; +// Username. +$user = "trinity"; +// Password. +$pass = "trinity"; +// Site title. +$title = "Registration Form"; +$title2 = "Some Server"; +// End config. + + +?> diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index bbcf03da9c3..00d211ccf2c 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -31,6 +31,7 @@ #include "Player.h" #include "Unit.h" #include "Spell.h" +#include "SpellId.h" #include "DynamicObject.h" #include "Group.h" #include "UpdateData.h" @@ -6679,8 +6680,9 @@ void AuraEffect::PeriodicDummyTick() } } break; - case 58600: // No fly Zone - Dalaran - if (10 == m_tickNumber) + case SPELL_RESTRICTED_FLIGHT_AREA_58730: // No Fly Zone - Wintergrasp + case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran + if (m_tickNumber == 10) { m_target->RemoveAurasByType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED); m_target->RemoveAurasByType(SPELL_AURA_FLY); |