josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
This commit is contained in:
Nay
2013-07-14 18:59:09 +01:00
parent b56b282eee 8b0cea7a5e
commit b87f794e16
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sql/updates/world/2013_07_14_01_world_item_template.sql
+14
View File
@@ -0,0 +1,14 @@
UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=23614;
UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28635;
UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28636;
UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=28637;
UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=30503;
UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=34868;
UPDATE `item_template` SET `Flags`=0x80000000 WHERE `entry`=37020;
UPDATE `item_template` SET `Flags`=0x80010000 WHERE `entry`=37200;
UPDATE `item_template` SET `Flags`=0x80000040 WHERE `entry`=40652;
UPDATE `item_template` SET `Flags`=0x80000040 WHERE `entry`=40970;
UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=41843;
UPDATE `item_template` SET `Flags`=0x80000800 WHERE `entry`=42782;
ALTER TABLE `item_template` CHANGE `Flags` `Flags` int(10) unsigned NOT NULL DEFAULT '0';
src/server/game/Entities/Player/Player.cpp
+3 -3
View File
@@ -22642,10 +22642,10 @@ bool Player::IsAlwaysDetectableFor(WorldObject const* seer) const
if (const Player* seerPlayer = seer->ToPlayer())
if (IsGroupVisibleFor(seerPlayer))
return true;
return !(seerPlayer->duel && seerPlayer->duel->startTime != 0 && seerPlayer->duel->opponent == this);
return false;
}
return false;
}
bool Player::IsVisibleGloballyFor(Player const* u) const
{
src/server/game/Globals/ObjectMgr.cpp
+1 -1
View File
@@ -2542,7 +2542,7 @@ void ObjectMgr::LoadItemTemplates()
itemTemplate.Name1 = fields[4].GetString();
itemTemplate.DisplayInfoID = fields[5].GetUInt32();
itemTemplate.Quality = uint32(fields[6].GetUInt8());
itemTemplate.Flags = uint32(fields[7].GetInt64());
itemTemplate.Flags = uint32(fields[7].GetUInt32());
itemTemplate.Flags2 = fields[8].GetUInt32();
itemTemplate.Unk430_1 = fields[9].GetFloat();
itemTemplate.Unk430_2 = fields[10].GetFloat();