Compare commits

...

8 Commits

12 changed files with 90 additions and 19 deletions
@@ -0,0 +1,27 @@
-- DB update 2016_09_04_00 -> 2016_11_19_00
DROP PROCEDURE IF EXISTS `updateDb`;
DELIMITER //
CREATE PROCEDURE updateDb ()
proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
START TRANSACTION;
ALTER TABLE version_db_auth CHANGE COLUMN 2016_09_04_00 2016_11_19_00 bit;
SELECT sql_rev INTO OK FROM version_db_auth WHERE sql_rev = '1478975214169487000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
--
-- START UPDATING QUERIES
--
INSERT INTO version_db_auth (`sql_rev`) VALUES ('1478975214169487000');
ALTER TABLE `account`
ADD `token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `s`,
ADD `reg_mail` VARCHAR(255) NOT NULL DEFAULT '' AFTER `email`,
ADD `last_attempt_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1' AFTER `last_ip`,
ADD `lock_country` VARCHAR(2) NOT NULL DEFAULT '00' AFTER `locked`;
--
-- END UPDATING QUERIES
--
COMMIT;
END;
//
DELIMITER ;
CALL updateDb();
DROP PROCEDURE IF EXISTS `updateDb`;
@@ -0,0 +1,25 @@
-- DB update 2016_08_25_00 -> 2016_11_19_00
DROP PROCEDURE IF EXISTS `updateDb`;
DELIMITER //
CREATE PROCEDURE updateDb ()
proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
START TRANSACTION;
ALTER TABLE version_db_characters CHANGE COLUMN 2016_08_25_00 2016_11_19_00 bit;
SELECT sql_rev INTO OK FROM version_db_characters WHERE sql_rev = '1478978518254125000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
--
-- START UPDATING QUERIES
--
INSERT INTO version_db_characters (`sql_rev`) VALUES ('1478978518254125000');
ALTER TABLE `arena_team_member`
CHANGE COLUMN `personalRating` `personalRating` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `seasonWins`,
DROP COLUMN `personal_rating`;
--
-- END UPDATING QUERIES
--
COMMIT;
END;
//
DELIMITER ;
CALL updateDb();
DROP PROCEDURE IF EXISTS `updateDb`;
@@ -0,0 +1,23 @@
-- DB update 2016_11_06_02 -> 2016_11_19_00
DROP PROCEDURE IF EXISTS `updateDb`;
DELIMITER //
CREATE PROCEDURE updateDb ()
proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
START TRANSACTION;
ALTER TABLE version_db_world CHANGE COLUMN 2016_11_06_02 2016_11_19_00 bit;
SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1477236823674130000'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
--
-- START UPDATING QUERIES
--
INSERT INTO version_db_world(`sql_rev`) VALUES ('1477236823674130000');
UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `RequiredItemCount1` ="1", `Flags` = "0" WHERE `ID` = "10923";
--
-- END UPDATING QUERIES
--
COMMIT;
END;
//
DELIMITER ;
CALL updateDb();
DROP PROCEDURE IF EXISTS `updateDb`;
@@ -1,7 +0,0 @@
INSERT INTO version_db_auth (`sql_rev`) VALUES ('1478975214169487000');
ALTER TABLE `account`
ADD `token_key` VARCHAR(100) NOT NULL DEFAULT '' AFTER `s`,
ADD `reg_mail` VARCHAR(255) NOT NULL DEFAULT '' AFTER `mail`,
ADD `last_attempt_ip` VARCHAR(15) NOT NULL DEFAULT '127.0.0.1' AFTER `last_ip`,
ADD `lock_country` VARCHAR(2) NOT NULL DEFAULT '00' AFTER `locked`;
@@ -1,5 +0,0 @@
INSERT INTO version_db_characters (`sql_rev`) VALUES ('1478978518254125000');
ALTER TABLE `arena_team_member`
CHANGE COLUMN `personalRating` `personalRating` SMALLINT(5) NOT NULL DEFAULT '0' AFTER `seasonWins`,
DROP COLUMN `personal_rating`;
@@ -1,3 +0,0 @@
INSERT INTO version_db_world(`sql_rev`) VALUES ('1477236823674130000');
UPDATE `quest_template` SET `SpecialFlags` = "0", `RequiredItemId1` = "31811", `RequiredItemCount1` ="1", `Flags` = "0" WHERE `ID` = "10923"
+1 -1
View File
@@ -557,7 +557,7 @@ bool AuthSocket::_HandleLogonProof()
A.SetBinary(lp.A, 32);
// SRP safeguard: abort if A == 0
if (A.isZero())
if ((A % N).isZero())
{
socket().shutdown();
return true;
+1 -1
View File
@@ -19,7 +19,7 @@ enum eStatus
STATUS_CHALLENGE,
STATUS_LOGON_PROOF,
STATUS_RECON_PROOF,
STATUS_PATCH, // unused in CMaNGOS
STATUS_PATCH, // unused
STATUS_AUTHED,
STATUS_CLOSED
};
+2
View File
@@ -12820,6 +12820,8 @@ void Player::MoveItemFromInventory(uint8 bag, uint8 slot, bool update)
it->RemoveFromWorld();
it->DestroyForPlayer(this);
}
sScriptMgr->OnAfterPlayerMoveItemFromInventory(this,it,bag,slot,update);
}
}
+5
View File
@@ -1328,6 +1328,11 @@ void ScriptMgr::OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item
FOREACH_SCRIPT(PlayerScript)->OnAfterSetVisibleItemSlot(player, slot,item);
}
void ScriptMgr::OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update)
{
FOREACH_SCRIPT(PlayerScript)->OnAfterMoveItemFromInventory(player, it, bag, slot, update);
}
// Guild
void ScriptMgr::OnGuildAddMember(Guild* guild, Player* player, uint8& plRank)
{
+5 -1
View File
@@ -788,6 +788,9 @@ class PlayerScript : public ScriptObject
// To change behaviour of set visible item slot
virtual void OnAfterSetVisibleItemSlot(Player* /*player*/, uint8 /*slot*/, Item* /*item*/) { }
// After an item has been moved from inventory
virtual void OnAfterMoveItemFromInventory(Player* /*player*/, Item* /*it*/,uint8 /*bag*/, uint8 /*slot*/, bool /*update*/) { }
};
class GuildScript : public ScriptObject
@@ -1084,7 +1087,8 @@ class ScriptMgr
void OnGossipSelect(Player* player, uint32 menu_id, uint32 sender, uint32 action);
void OnGossipSelectCode(Player* player, uint32 menu_id, uint32 sender, uint32 action, const char* code);
void OnPlayerBeingCharmed(Player* player, Unit* charmer, uint32 oldFactionId, uint32 newFactionId);
void OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 /*slot*/, Item *item);
void OnAfterPlayerSetVisibleItemSlot(Player* player, uint8 slot, Item *item);
void OnAfterPlayerMoveItemFromInventory(Player* player, Item* it, uint8 bag, uint8 slot, bool update);
public: /* GuildScript */