aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/updates/7128_world_command.sql2
-rw-r--r--sql/world.sql7
-rw-r--r--src/game/Chat.h7
-rw-r--r--src/game/Player.cpp6
-rw-r--r--src/game/SpellAuraEffects.cpp1
-rw-r--r--src/game/SpellMgr.cpp21
-rw-r--r--src/game/World.cpp11
-rw-r--r--src/game/World.h24
8 files changed, 2 insertions, 77 deletions
diff --git a/sql/updates/7128_world_command.sql b/sql/updates/7128_world_command.sql
new file mode 100644
index 00000000000..958c3b53e34
--- /dev/null
+++ b/sql/updates/7128_world_command.sql
@@ -0,0 +1,2 @@
+-- Remove Wintergrasp commands from command table
+DELETE FROM `command` WHERE `name` LIKE '%wg%';
diff --git a/sql/world.sql b/sql/world.sql
index 9376d92c1d0..ff6cd6cdcdf 100644
--- a/sql/world.sql
+++ b/sql/world.sql
@@ -684,13 +684,6 @@ INSERT INTO `command` VALUES
('unpossess','3','Syntax: .unpossess\r\n\r\nIf you are possessed, unpossesses yourself; otherwise unpossesses current possessed target.'),
('waterwalk','2','Syntax: .waterwalk on/off\r\n\r\nSet on/off waterwalk state for selected player or self if no player selected.'),
('wchange','3','Syntax: .wchange #weathertype #status\r\n\r\nSet current weather to #weathertype with an intensity of #status.\r\n\r\n#weathertype can be 1 for rain, 2 for snow, and 3 for sand. #status can be 0 for disabled, and 1 for enabled.'),
-('wg','3','Syntax: .wg $subcommand.'),
-('wg enable','3','Syntax: .wg enable [on/off] Enable/Disable Wintergrasp outdoorPvP.'),
-('wg start','3','Syntax: .wg start\r\nForce Wintergrasp battle start.'),
-('wg status','3','Syntax: .wg status\r\nWintergrasp info, defender, timer, wartime.'),
-('wg stop','3','Syntax: .wg stop\r\nForce Wintergrasp battle stop (No rewards).'),
-('wg switch','3','Syntax: .wg switch\r\nSwitchs Wintergrasp defender team.'),
-('wg timer','3','Syntax: .wg timer $minutes\r\nChange the current timer. Min value = 1, Max value 60 (Wartime), 1440 (Not Wartime)'),
('whispers','1','Syntax: .whispers on|off\r\nEnable/disable accepting whispers by GM from players. By default use trinityd.conf setting.'),
('wp event','2','Syntax: .wp event $subcommand\nType .path event to see the list of possible subcommands or .help path event $subcommand to see info on subcommands.'),
('wp load','2','Syntax: .wp load $pathid\nLoad pathid number for selected creature. Creature must have no waypoint data.'),
diff --git a/src/game/Chat.h b/src/game/Chat.h
index e13f46782c4..fb359155bfa 100644
--- a/src/game/Chat.h
+++ b/src/game/Chat.h
@@ -471,13 +471,6 @@ class TRINITY_DLL_SPEC ChatHandler
bool HandleWpShowCommand(const char* args);
bool HandleReloadAllPaths(const char *args);
- bool HandleWintergraspStatusCommand(const char *args);
- bool HandleWintergraspStartCommand(const char *args);
- bool HandleWintergraspStopCommand(const char *args);
- bool HandleWintergraspEnableCommand(const char *args);
- bool HandleWintergraspSwitchTeamCommand(const char *args);
- bool HandleWintergraspTimerCommand(const char *args);
-
bool HandleHelpCommand(const char* args);
bool HandleCommandsCommand(const char* args);
bool HandleStartCommand(const char* args);
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 480a8f26a70..59280f1e7e1 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -8253,12 +8253,6 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
// 8 Arena season id
data << uint32(0xF3D) << uint32(sWorld.getConfig(CONFIG_ARENA_SEASON_ID));
- // May be send timer to start Wintergrasp
- //if(sWorld.GetWintergrapsState()==4354)
- // data << uint32(0x1102) << sWorld.GetWintergrapsTimer();
- //else
- // data << uint32(0xEC5) << sWorld.GetWintergrapsTimer();
- // ---
if(mapid == 530) // Outland
{
data << uint32(0x9bf) << uint32(0x0); // 7
diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp
index ef13b9901bc..da27cc0ef10 100644
--- a/src/game/SpellAuraEffects.cpp
+++ b/src/game/SpellAuraEffects.cpp
@@ -1702,7 +1702,6 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const
}
}
break;
- case SPELL_RESTRICTED_FLIGHT_AREA_58730: // No Fly Zone - Wintergrasp
case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran
if (GetTickNumber() == 10)
{
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 5b6f73fce4f..d4c5c80cbce 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2994,27 +2994,6 @@ bool SpellArea::IsFitToRequirements(Player const* player, uint32 newZone, uint32
if (!player || auraSpell > 0 && !player->HasAura(auraSpell) || auraSpell < 0 && player->HasAura(-auraSpell))
return false;
- // Extra conditions
- switch(spellId)
- {
- case SPELL_RESTRICTED_FLIGHT_AREA_58600: // No fly Zone - Dalaran (Krasus Landing exception)
- if (!player || player->GetAreaId() == 4564 || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY)
- || player->HasAura(44795))
- return false;
- break;
- case SPELL_RESTRICTED_FLIGHT_AREA_58730: // No fly Zone - Wintergrasp
- if (!player || !player->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) && !player->HasAuraType(SPELL_AURA_FLY)
- || player->HasAura(45472) || player->HasAura(44795))
- return false;
- break;
- case SPELL_ESSENCE_OF_WINTERGRASP_58045: // Essence of Wintergrasp - Wintergrasp
- case SPELL_ESSENCE_OF_WINTERGRASP_57940: // Essence of Wintergrasp - Northrend
- if (!player || player->GetTeamId() != sWorld.getState(WORLDSTATE_WINTERGRASP_CONTROLING_FACTION))
- return false;
- break;
- }
-
- return true;
}
//-----------TRINITY-------------
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 570d4b5573c..7779fbdee6c 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -1188,17 +1188,6 @@ void World::LoadConfigSettings(bool reload)
if (m_configs[CONFIG_PVP_TOKEN_COUNT] < 1)
m_configs[CONFIG_PVP_TOKEN_COUNT] = 1;
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED] = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.Enabled", true);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.StartTime", 30);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.BattleTime", 30);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.Interval", 150);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR] = sConfig.GetBoolDefault("OutdoorPvP.Wintergrasp.CustomHonorRewards", false);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_WIN_BATTLE] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorBattleWin", 3000);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_LOSE_BATTLE] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorBattleLose", 1250);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_TOWER] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorDamageTower", 750);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_DESTROYED_TOWER] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorDestroyedTower", 750);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_BUILDING] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorDamagedBuilding", 750);
- m_configs[CONFIG_OUTDOORPVP_WINTERGRASP_INTACT_BUILDING] = sConfig.GetIntDefault("OutdoorPvP.Wintergrasp.CustomHonorIntactBuilding", 1500);
m_configs[CONFIG_NO_RESET_TALENT_COST] = sConfig.GetBoolDefault("NoResetTalentsCost", false);
m_configs[CONFIG_SHOW_KICK_IN_WORLD] = sConfig.GetBoolDefault("ShowKickInWorld", false);
diff --git a/src/game/World.h b/src/game/World.h
index 70d2296455e..8acc6fecbb8 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -89,7 +89,6 @@ enum WorldTimers
// States than may change after server started
enum WorldStates
{
- WORLDSTATE_WINTERGRASP_CONTROLING_FACTION,
WORLDSTATE_VALUE_COUNT,
};
@@ -248,17 +247,6 @@ enum WorldConfigs
CONFIG_PVP_TOKEN_MAP_TYPE,
CONFIG_PVP_TOKEN_ID,
CONFIG_PVP_TOKEN_COUNT,
- CONFIG_OUTDOORPVP_WINTERGRASP_ENABLED,
- CONFIG_OUTDOORPVP_WINTERGRASP_START_TIME,
- CONFIG_OUTDOORPVP_WINTERGRASP_BATTLE_TIME,
- CONFIG_OUTDOORPVP_WINTERGRASP_INTERVAL,
- CONFIG_OUTDOORPVP_WINTERGRASP_CUSTOM_HONOR,
- CONFIG_OUTDOORPVP_WINTERGRASP_WIN_BATTLE,
- CONFIG_OUTDOORPVP_WINTERGRASP_LOSE_BATTLE,
- CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_TOWER,
- CONFIG_OUTDOORPVP_WINTERGRASP_DESTROYED_TOWER,
- CONFIG_OUTDOORPVP_WINTERGRASP_DAMAGED_BUILDING,
- CONFIG_OUTDOORPVP_WINTERGRASP_INTACT_BUILDING,
CONFIG_NO_RESET_TALENT_COST,
CONFIG_SHOW_KICK_IN_WORLD,
CONFIG_INTERVAL_LOG_UPDATE,
@@ -619,18 +607,6 @@ class World
static int32 GetVisibilityNotifyPeriodInInstances() { return m_visibility_notify_periodInInstances; }
static int32 GetVisibilityNotifyPeriodInBGArenas() { return m_visibility_notify_periodInBGArenas; }
- void SetWintergrapsTimer(uint32 timer, uint32 state)
- {
- m_WintergrapsTimer = timer;
- m_WintergrapsState = state;
- }
-
- uint32 GetWintergrapsTimer() { return m_WintergrapsTimer; }
- uint32 GetWintergrapsState() { return m_WintergrapsState; }
-
- uint32 m_WintergrapsTimer;
- uint32 m_WintergrapsState;
-
void ProcessCliCommands();
void QueueCliCommand( CliCommandHolder::Print* zprintf, char const* input ) { cliCmdQueue.add(new CliCommandHolder(input, zprintf)); }