mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-21 01:37:37 +01:00
*Cleanup
--HG-- branch : trunk
This commit is contained in:
@@ -229,7 +229,7 @@ void GameObject::Update(uint32 /*p_time*/)
|
||||
{
|
||||
// splash bobber (bobber ready now)
|
||||
Unit* caster = GetOwner();
|
||||
if(caster && caster->GetTypeId()==TYPEID_PLAYER)
|
||||
if(caster && caster->GetTypeId() == TYPEID_PLAYER)
|
||||
{
|
||||
SetGoState(GO_STATE_ACTIVE);
|
||||
SetUInt32Value(GAMEOBJECT_FLAGS, GO_FLAG_NODESPAWN);
|
||||
@@ -268,7 +268,7 @@ void GameObject::Update(uint32 /*p_time*/)
|
||||
case GAMEOBJECT_TYPE_FISHINGNODE: // can't fish now
|
||||
{
|
||||
Unit* caster = GetOwner();
|
||||
if(caster && caster->GetTypeId()==TYPEID_PLAYER)
|
||||
if(caster && caster->GetTypeId() == TYPEID_PLAYER)
|
||||
{
|
||||
caster->FinishSpell(CURRENT_CHANNELED_SPELL);
|
||||
|
||||
@@ -965,7 +965,7 @@ void GameObject::Use(Unit* user)
|
||||
|
||||
case GAMEOBJECT_TYPE_QUESTGIVER: //2
|
||||
{
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -981,7 +981,7 @@ void GameObject::Use(Unit* user)
|
||||
if(!info)
|
||||
return;
|
||||
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1040,7 +1040,7 @@ void GameObject::Use(Unit* user)
|
||||
{
|
||||
GameObjectInfo const* info = GetGOInfo();
|
||||
|
||||
if(user->GetTypeId()==TYPEID_PLAYER)
|
||||
if(user->GetTypeId() == TYPEID_PLAYER)
|
||||
{
|
||||
Player* player = (Player*)user;
|
||||
|
||||
@@ -1070,7 +1070,7 @@ void GameObject::Use(Unit* user)
|
||||
if(!info)
|
||||
return;
|
||||
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1086,7 +1086,7 @@ void GameObject::Use(Unit* user)
|
||||
//fishing bobber
|
||||
case GAMEOBJECT_TYPE_FISHINGNODE: //17
|
||||
{
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1162,7 +1162,7 @@ void GameObject::Use(Unit* user)
|
||||
|
||||
case GAMEOBJECT_TYPE_SUMMONING_RITUAL: //18
|
||||
{
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1171,7 +1171,7 @@ void GameObject::Use(Unit* user)
|
||||
|
||||
GameObjectInfo const* info = GetGOInfo();
|
||||
|
||||
if( !caster || caster->GetTypeId()!=TYPEID_PLAYER )
|
||||
if( !caster || caster->GetTypeId() != TYPEID_PLAYER )
|
||||
return;
|
||||
|
||||
// accept only use by player from same group for caster except caster itself
|
||||
@@ -1219,10 +1219,10 @@ void GameObject::Use(Unit* user)
|
||||
if(info->spellcaster.partyOnly)
|
||||
{
|
||||
Unit* caster = GetOwner();
|
||||
if( !caster || caster->GetTypeId()!=TYPEID_PLAYER )
|
||||
if( !caster || caster->GetTypeId() != TYPEID_PLAYER )
|
||||
return;
|
||||
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER || !((Player*)user)->IsInSameRaidWith((Player*)caster))
|
||||
if(user->GetTypeId() != TYPEID_PLAYER || !((Player*)user)->IsInSameRaidWith((Player*)caster))
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1235,7 +1235,7 @@ void GameObject::Use(Unit* user)
|
||||
{
|
||||
GameObjectInfo const* info = GetGOInfo();
|
||||
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1264,7 +1264,7 @@ void GameObject::Use(Unit* user)
|
||||
|
||||
case GAMEOBJECT_TYPE_FLAGSTAND: // 24
|
||||
{
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1289,7 +1289,7 @@ void GameObject::Use(Unit* user)
|
||||
}
|
||||
case GAMEOBJECT_TYPE_FLAGDROP: // 26
|
||||
{
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1338,7 +1338,7 @@ void GameObject::Use(Unit* user)
|
||||
if(!info)
|
||||
return;
|
||||
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER)
|
||||
if(user->GetTypeId() != TYPEID_PLAYER)
|
||||
return;
|
||||
|
||||
Player* player = (Player*)user;
|
||||
@@ -1363,7 +1363,7 @@ void GameObject::Use(Unit* user)
|
||||
SpellEntry const *spellInfo = sSpellStore.LookupEntry( spellId );
|
||||
if(!spellInfo)
|
||||
{
|
||||
if(user->GetTypeId()!=TYPEID_PLAYER || !sOutdoorPvPMgr.HandleCustomSpell((Player*)user,spellId,this))
|
||||
if(user->GetTypeId() != TYPEID_PLAYER || !sOutdoorPvPMgr.HandleCustomSpell((Player*)user,spellId,this))
|
||||
sLog.outError("WORLD: unknown spell id %u at use action for gameobject (Entry: %u GoType: %u )", spellId,GetEntry(),GetGoType());
|
||||
else
|
||||
sLog.outDebug("WORLD: %u non-dbc spell was handled by OutdoorPvP", spellId);
|
||||
|
||||
Reference in New Issue
Block a user