mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-02-05 08:28:57 +01:00
* Merge...
--HG-- branch : trunk
This commit is contained in:
@@ -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();
|
||||
|
||||
18
contrib/registration_form/simple/db.conf.php.dist
Normal file
18
contrib/registration_form/simple/db.conf.php.dist
Normal file
@@ -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.
|
||||
|
||||
|
||||
?>
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user