mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11830] Do not allow referenced loot with negative chance, bug found by crackm

Browse source 
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
Schmoozerd 2011-10-16 21:33:53 +02:00
parent 15028559c9
commit 428b7b9178
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/game/LootMgr.cpp
View file

@ -119,7 +119,7 @@ void LootStore::LoadLootTable()
uint32 cond_value1 = fields[7].GetUInt32(); uint32 cond_value1 = fields[7].GetUInt32();
uint32 cond_value2 = fields[8].GetUInt32(); uint32 cond_value2 = fields[8].GetUInt32();
if(maxcount > std::numeric_limits<uint8>::max()) if (maxcount > std::numeric_limits<uint8>::max())
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount,std::numeric_limits<uint8>::max()); sLog.outErrorDb("Table '%s' entry %d item %d: maxcount value (%u) to large. must be less %u - skipped", GetName(), entry, item, maxcount,std::numeric_limits<uint8>::max());
continue; // error already printed to log/console. continue; // error already printed to log/console.
@ -127,12 +127,11 @@ void LootStore::LoadLootTable()
if (mincountOrRef < 0 && condition != CONDITION_NONE) if (mincountOrRef < 0 && condition != CONDITION_NONE)
{ {
sLog.outErrorDb("Table '%s' entry %u mincountOrRef %i < 0 and not allowed has condition, skipped", sLog.outErrorDb("Table '%s' entry %u mincountOrRef %i < 0 and not allowed has condition, skipped", GetName(), entry, mincountOrRef);
GetName(), entry, mincountOrRef);
continue; continue;
} }
if(!PlayerCondition::IsValid(condition,cond_value1, cond_value2)) if (!PlayerCondition::IsValid(condition,cond_value1, cond_value2))
{ {
sLog.outErrorDb("... in table '%s' entry %u item %u", GetName(), entry, item); sLog.outErrorDb("... in table '%s' entry %u item %u", GetName(), entry, item);
continue; // error already printed to log/console. continue; // error already printed to log/console.
@ -261,7 +260,7 @@ bool LootStoreItem::Roll(bool rate) const
// Checks correctness of values // Checks correctness of values
bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
{ {
if(group >= 1 << 7) // it stored in 7 bit field if (group >= 1 << 7) // it stored in 7 bit field
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: group (%u) must be less %u - skipped", store.GetName(), entry, itemid, group, 1 << 7); sLog.outErrorDb("Table '%s' entry %d item %d: group (%u) must be less %u - skipped", store.GetName(), entry, itemid, group, 1 << 7);
return false; return false;
@ -273,7 +272,7 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
return false; return false;
} }
if( mincountOrRef > 0 ) // item (quest or non-quest) entry, maybe grouped if (mincountOrRef > 0) // item (quest or non-quest) entry, maybe grouped
{ {
ItemPrototype const *proto = ObjectMgr::GetItemPrototype(itemid); ItemPrototype const *proto = ObjectMgr::GetItemPrototype(itemid);
if(!proto) if(!proto)
@ -282,20 +281,19 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
return false; return false;
} }
if( chance == 0 && group == 0) // Zero chance is allowed for grouped entries only if (chance == 0 && group == 0) // Zero chance is allowed for grouped entries only
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: equal-chanced grouped entry, but group not defined - skipped", store.GetName(), entry, itemid); sLog.outErrorDb("Table '%s' entry %d item %d: equal-chanced grouped entry, but group not defined - skipped", store.GetName(), entry, itemid);
return false; return false;
} }
if( chance != 0 && chance < 0.000001f ) // loot with low chance if (chance != 0 && chance < 0.000001f) // loot with low chance
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: low chance (%f) - skipped", sLog.outErrorDb("Table '%s' entry %d item %d: low chance (%f) - skipped", store.GetName(), entry, itemid, chance);
store.GetName(), entry, itemid, chance);
return false; return false;
} }
if( maxcount < mincountOrRef) // wrong max count if (maxcount < mincountOrRef) // wrong max count
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: max count (%u) less that min count (%i) - skipped", store.GetName(), entry, itemid, uint32(maxcount), mincountOrRef); sLog.outErrorDb("Table '%s' entry %d item %d: max count (%u) less that min count (%i) - skipped", store.GetName(), entry, itemid, uint32(maxcount), mincountOrRef);
return false; return false;
@ -305,8 +303,11 @@ bool LootStoreItem::IsValid(LootStore const& store, uint32 entry) const
else // mincountOrRef < 0 else // mincountOrRef < 0
{ {
if (needs_quest) if (needs_quest)
sLog.outErrorDb("Table '%s' entry %d item %d: quest chance will be treated as non-quest chance", store.GetName(), entry, itemid); {
else if( chance == 0 ) // no chance for the reference sLog.outErrorDb("Table '%s' entry %d item %d: negative chance is specified for a reference, skipped", store.GetName(), entry, itemid);
return false;
}
else if (chance == 0) // no chance for the reference
{ {
sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is specified for a reference, skipped", store.GetName(), entry, itemid); sLog.outErrorDb("Table '%s' entry %d item %d: zero chance is specified for a reference, skipped", store.GetName(), entry, itemid);
return false; return false;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11829" #define REVISION_NR "11830"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__