Skip to content

Instantly share code, notes, and snippets.

@Natureknight
Created December 22, 2015 14:52
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Natureknight/61f9be26499b22fe640a to your computer and use it in GitHub Desktop.
Save Natureknight/61f9be26499b22fe640a to your computer and use it in GitHub Desktop.
diff --git a/src/server/scripts/Custom/copyGearCommands.cpp b/src/server/scripts/Custom/copyGearCommands.cpp
index 9a10475..49884d8 100644
--- a/src/server/scripts/Custom/copyGearCommands.cpp
+++ b/src/server/scripts/Custom/copyGearCommands.cpp
@@ -89,6 +89,12 @@ public:
return false;
}
+ if (player->getClass() != target->getClass())
+ {
+ handler->GetSession()->SendAreaTriggerMessage("Target's class doesn't match your class.");
+ return false;
+ }
+
// Restrict copying from the opposite faction
if (player->GetTeam() != target->GetTeam())
{
@@ -128,13 +134,8 @@ public:
else // If no name was entered - use target
{
target = handler->getSelectedPlayer();
- if (target && target != player)
+ if (target)
name = target->GetName();
- else
- {
- handler->GetSession()->SendAreaTriggerMessage("You can't copy your own gear/talents.");
- return false;
- }
}
if (target)
@@ -145,6 +146,12 @@ public:
return false;
}
+ if (player->getClass() != target->getClass())
+ {
+ handler->GetSession()->SendAreaTriggerMessage("Target's class doesn't match your class.");
+ return false;
+ }
+
CopyTalents(player, target);
handler->GetSession()->SendAreaTriggerMessage("Successfuly copied talents of %s",
target->GetName());
@@ -175,13 +182,8 @@ public:
else // If no name was entered - use target
{
target = handler->getSelectedPlayer();
- if (target && target != player)
+ if (target)
name = target->GetName();
- else
- {
- handler->GetSession()->SendAreaTriggerMessage("You can't copy your own gear/talents.");
- return false;
- }
}
if (target)
@@ -192,6 +194,12 @@ public:
return false;
}
+ if (player->getClass() != target->getClass())
+ {
+ handler->GetSession()->SendAreaTriggerMessage("Target's class doesn't match your class.");
+ return false;
+ }
+
// Restrict copying from the opposite faction
if (player->GetTeam() != target->GetTeam())
{
@@ -199,6 +207,7 @@ public:
return false;
}
+
CopyGear(player, target);
CopyTalents(player, target);
handler->GetSession()->SendAreaTriggerMessage("Successfuly copied gear and talents of %s",
warning: LF will be replaced by CRLF in src/server/scripts/Custom/copyGearCommands.cpp.
The file will have its original line endings in your working directory.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment