From 43fa7d48a5650c71f74098f3398cf5aca89c3837 Mon Sep 17 00:00:00 2001 From: treeston Date: Sun, 27 Dec 2015 18:03:03 +0100 Subject: Game/Maps: Clean up instance handling. - Rename Map::CanEnter to Map::CannotEnter. Return value changed from boolean (true means player can enter) to enum Map::EnterState (CAN_ENTER=0 means player can enter, any other value is a reason for deny). - Move hack-y player error messages from within Map::CanEnter to the function calling CanEnter as appropriate (primarily WorldSession::HandleAreaTriggerOpcode). - Modify WorldSession::HandleAreaTriggerOpcode to properly revive the player upon touching the portal leading to the instance they died in even if they are currently unable to zone in. Fixes and closes #15758. - Modify Player::LoadFromDB to properly spawn players in the instance they logged off in if possible. Fixes and closes #15561. - Modify permanent save behavior to be blizzlike: Players can always enter an instance they are saved to (assuming there are no map constraints against it), but get a homebind timer if the instance is already in use. --- sql/updates/world/2015_12_27_instancerevive.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2015_12_27_instancerevive.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2015_12_27_instancerevive.sql b/sql/updates/world/2015_12_27_instancerevive.sql new file mode 100644 index 00000000000..3bee62963ef --- /dev/null +++ b/sql/updates/world/2015_12_27_instancerevive.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `trinity_string` WHERE `entry`=11014; +INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES +(11014,"You are already locked to %s."); -- cgit v1.2.3