pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 07:21:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Disabled deity checks in item swaps until issue is 100% resolved

Browse Source
This commit is contained in:
Uleat 2017-04-02 15:35:13 -04:00
parent 8133de4bb4
commit 23115ca177
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/deity.h
View File

@ -49,7 +49,7 @@ namespace EQEmu
}; };
enum DeityTypeBit : uint32 { enum DeityTypeBit : uint32 {
bit_DeityAll = 0x00000000, bit_DeityNone = 0x00000000,
bit_DeityAgnostic = 0x00000001, bit_DeityAgnostic = 0x00000001,
bit_DeityBertoxxulous = 0x00000002, bit_DeityBertoxxulous = 0x00000002,
bit_DeityBrellSirilis = 0x00000004, bit_DeityBrellSirilis = 0x00000004,
@ -66,7 +66,8 @@ namespace EQEmu
bit_DeitySolusekRo = 0x00002000, bit_DeitySolusekRo = 0x00002000,
bit_DeityTheTribunal = 0x00004000, bit_DeityTheTribunal = 0x00004000,
bit_DeityTunare = 0x00008000, bit_DeityTunare = 0x00008000,
bit_DeityVeeshan = 0x00010000 bit_DeityVeeshan = 0x00010000,
bit_DeityAll = 0xFFFFFFFF
}; };
extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type); extern DeityTypeBit ConvertDeityTypeToDeityTypeBit(DeityType deity_type);

8
common/inventory_profile.cpp
View File

@ -264,10 +264,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS
fail_state = swapRaceClass; fail_state = swapRaceClass;
return false; return false;
} }
if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) { /*if (deity_id && item_a->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_a->Deity)) {
fail_state = swapDeity; fail_state = swapDeity;
return false; return false;
} }*/
if (level && item_a->ReqLevel && level < item_a->ReqLevel) { if (level && item_a->ReqLevel && level < item_a->ReqLevel) {
fail_state = swapLevel; fail_state = swapLevel;
return false; return false;
@ -290,10 +290,10 @@ bool EQEmu::InventoryProfile::SwapItem(int16 slot_a, int16 slot_b, SwapItemFailS
fail_state = swapRaceClass; fail_state = swapRaceClass;
return false; return false;
} }
if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) { /*if (deity_id && item_b->Deity && !(deity::ConvertDeityTypeToDeityTypeBit((deity::DeityType)deity_id) & item_b->Deity)) {
fail_state = swapDeity; fail_state = swapDeity;
return false; return false;
} }*/
if (level && item_b->ReqLevel && level < item_b->ReqLevel) { if (level && item_b->ReqLevel && level < item_b->ReqLevel) {
fail_state = swapLevel; fail_state = swapLevel;
return false; return false;

4
zone/inventory.cpp
View File

@ -1833,8 +1833,10 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
else if (fail_state == EQEmu::InventoryProfile::swapLevel) else if (fail_state == EQEmu::InventoryProfile::swapLevel)
fail_message = "You are not sufficient level to use this item."; fail_message = "You are not sufficient level to use this item.";
if (fail_message) if (fail_message) {
Message(CC_Red, "%s", fail_message); Message(CC_Red, "%s", fail_message);
//Log(Logs::General, Logs::Error, "[%s] %s (r:%u, c:%u, d:%u, l:%u)", GetCleanName(), fail_message, GetRace(), GetClass(), GetDeity(), GetLevel());
}
return false; return false;
} }