nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-31 01:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/azerothcore/master'

Browse Source
This commit is contained in:
Nefertumm
2017-06-30 02:25:01 -03:00
parent 9d2484bfc7 88b301a09b
commit d1e85e1c47
4 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
data/sql/updates/db_world/2017_06_29_00.sql Normal file
View File

@@ -0,0 +1,31 @@
-- DB update 2017_06_27_00 -> 2017_06_29_00
DROP PROCEDURE IF EXISTS `updateDb`;
DELIMITER //
CREATE PROCEDURE updateDb ()
proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
SELECT COUNT(*) INTO @COLEXISTS
FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2017_06_27_00';
IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
START TRANSACTION;
ALTER TABLE version_db_world CHANGE COLUMN 2017_06_27_00 2017_06_29_00 bit;
SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1498768729664877100'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
--
-- START UPDATING QUERIES
--
INSERT INTO version_db_world (`sql_rev`) VALUES ('1498768729664877100');
DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (43369, -43369, -68347);
INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
(43369, 68347, 0, "Worg Disguise"),
(-43369, -68347, 0, "Worg Disguise"),
(-68347, -43369, 0, "Worg Disguise");
--
-- END UPDATING QUERIES
--
COMMIT;
END;
//
DELIMITER ;
CALL updateDb();
DROP PROCEDURE IF EXISTS `updateDb`;

2
src/game/Entities/Player/Player.cpp
View File

@@ -5148,6 +5148,8 @@ void Player::BuildPlayerRepop()
// set and clear other // set and clear other
SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND); SetByteValue(UNIT_FIELD_BYTES_1, 3, UNIT_BYTE1_FLAG_ALWAYS_STAND);
sScriptMgr->OnPlayerReleasedGhost(this);
} }
void Player::ResurrectPlayer(float restore_percent, bool applySickness) void Player::ResurrectPlayer(float restore_percent, bool applySickness)

5
src/game/Scripting/ScriptMgr.cpp
View File

@@ -1159,6 +1159,11 @@ bool ScriptMgr::OnCriteriaCheck(uint32 scriptId, Player* source, Unit* target)
} }
// Player // Player
void ScriptMgr::OnPlayerReleasedGhost(Player* player)
{
FOREACH_SCRIPT(PlayerScript)->OnPlayerReleasedGhost(player);
}
void ScriptMgr::OnPVPKill(Player* killer, Player* killed) void ScriptMgr::OnPVPKill(Player* killer, Player* killed)
{ {
FOREACH_SCRIPT(PlayerScript)->OnPVPKill(killer, killed); FOREACH_SCRIPT(PlayerScript)->OnPVPKill(killer, killed);

2
src/game/Scripting/ScriptMgr.h
View File

@@ -757,6 +757,7 @@ class PlayerScript : public ScriptObject
PlayerScript(const char* name); PlayerScript(const char* name);
public: public:
virtual void OnPlayerReleasedGhost(Player* /*player*/) { }
// Called when a player kills another player // Called when a player kills another player
virtual void OnPVPKill(Player* /*killer*/, Player* /*killed*/) { } virtual void OnPVPKill(Player* /*killer*/, Player* /*killed*/) { }
@@ -1171,6 +1172,7 @@ class ScriptMgr
public: /* PlayerScript */ public: /* PlayerScript */
void OnPlayerReleasedGhost(Player* player);
void OnPVPKill(Player* killer, Player* killed); void OnPVPKill(Player* killer, Player* killed);
void OnCreatureKill(Player* killer, Creature* killed); void OnCreatureKill(Player* killer, Creature* killed);
void OnPlayerKilledByCreature(Creature* killer, Player* killed); void OnPlayerKilledByCreature(Creature* killer, Player* killed);