mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-12 05:21:29 +00:00
Merge branch 'master' into shared_mem
This commit is contained in:
commit
d42ff6ce19
@ -11325,7 +11325,14 @@ void command_camerashake(Client *c, const Seperator *sep)
|
|||||||
|
|
||||||
void command_disarmtrap(Client *c, const Seperator *sep)
|
void command_disarmtrap(Client *c, const Seperator *sep)
|
||||||
{
|
{
|
||||||
Mob * target = c->GetTarget();
|
Mob *target = c->GetTarget();
|
||||||
|
|
||||||
|
if(!target)
|
||||||
|
{
|
||||||
|
c->Message(13, "You must have a target.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(target->IsNPC())
|
if(target->IsNPC())
|
||||||
{
|
{
|
||||||
if(c->HasSkill(DISARM_TRAPS))
|
if(c->HasSkill(DISARM_TRAPS))
|
||||||
@ -11344,7 +11351,13 @@ void command_disarmtrap(Client *c, const Seperator *sep)
|
|||||||
|
|
||||||
void command_sensetrap(Client *c, const Seperator *sep)
|
void command_sensetrap(Client *c, const Seperator *sep)
|
||||||
{
|
{
|
||||||
Mob * target = c->GetTarget();
|
Mob * target = c->GetTarget();
|
||||||
|
if(!target)
|
||||||
|
{
|
||||||
|
c->Message(13, "You must have a target.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(target->IsNPC())
|
if(target->IsNPC())
|
||||||
{
|
{
|
||||||
if(c->HasSkill(SENSE_TRAPS))
|
if(c->HasSkill(SENSE_TRAPS))
|
||||||
@ -11363,7 +11376,13 @@ void command_sensetrap(Client *c, const Seperator *sep)
|
|||||||
|
|
||||||
void command_picklock(Client *c, const Seperator *sep)
|
void command_picklock(Client *c, const Seperator *sep)
|
||||||
{
|
{
|
||||||
Mob * target = c->GetTarget();
|
Mob * target = c->GetTarget();
|
||||||
|
if(!target)
|
||||||
|
{
|
||||||
|
c->Message(13, "You must have a target.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if(target->IsNPC())
|
if(target->IsNPC())
|
||||||
{
|
{
|
||||||
if(c->HasSkill(PICK_LOCK))
|
if(c->HasSkill(PICK_LOCK))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user