Moved GM audit calculations after configuration is checked.
This commit is contained in:
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -353,8 +353,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -364,20 +374,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -550,19 +550,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -575,8 +563,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -358,8 +358,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -369,20 +379,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -555,19 +555,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -580,8 +568,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -358,8 +358,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -369,20 +379,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -555,19 +555,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -580,8 +568,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -358,8 +358,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -369,20 +379,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -555,19 +555,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -580,8 +568,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -341,19 +341,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -366,8 +354,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -455,19 +455,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -478,8 +466,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -355,19 +355,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -380,8 +368,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -469,19 +469,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -492,8 +480,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -355,19 +355,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -380,8 +368,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -469,19 +469,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -492,8 +480,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -355,19 +355,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -380,8 +368,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -469,19 +469,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -492,8 +480,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -332,19 +332,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -357,8 +345,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -446,19 +446,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -469,8 +457,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -331,8 +331,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -342,20 +352,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -528,19 +528,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -553,8 +541,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -338,19 +338,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -363,8 +351,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -452,19 +452,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -475,8 +463,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -334,8 +334,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -345,20 +355,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -531,19 +531,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -556,8 +544,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -338,19 +338,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -363,8 +351,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -452,19 +452,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -475,8 +463,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -334,8 +334,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -345,20 +355,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -531,19 +531,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -556,8 +544,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = ((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name";
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -353,8 +353,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -364,20 +374,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -550,19 +550,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -575,8 +563,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -353,8 +353,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -364,20 +374,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -550,19 +550,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -575,8 +563,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -358,8 +358,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -369,20 +379,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -555,19 +555,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -580,8 +568,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -358,8 +358,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -369,20 +379,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -555,19 +555,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -580,8 +568,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -341,19 +341,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -366,8 +354,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -455,19 +455,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -478,8 +466,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -362,8 +362,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -373,20 +383,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -559,19 +559,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -584,8 +572,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -362,8 +362,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -373,20 +383,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -559,19 +559,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -584,8 +572,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -362,8 +362,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -373,20 +383,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -559,19 +559,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -584,8 +572,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -362,8 +362,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -373,20 +383,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -559,19 +559,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -584,8 +572,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -343,19 +343,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -368,8 +356,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -457,19 +457,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -480,8 +468,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -362,8 +362,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -373,20 +383,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -559,19 +559,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -584,8 +572,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -340,19 +340,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -365,8 +353,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -454,19 +454,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -477,8 +465,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -353,8 +353,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -364,20 +374,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -550,19 +550,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -575,8 +563,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -355,19 +355,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -380,8 +368,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -469,19 +469,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -492,8 +480,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+28
-28
@@ -355,19 +355,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -380,8 +368,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -469,19 +469,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -492,8 +480,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -355,19 +355,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -380,8 +368,20 @@ public class ItemTable
|
||||
sb.append(" objId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// Notify to scripts
|
||||
@@ -469,19 +469,7 @@ public class ItemTable
|
||||
}
|
||||
}
|
||||
|
||||
if ((actor != null) && actor.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -492,8 +480,20 @@ public class ItemTable
|
||||
sb.append(" itemObjId: ");
|
||||
sb.append(item.getObjectId());
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
|
||||
// if it's a pet control item, delete the pet as well
|
||||
|
||||
+26
-26
@@ -365,8 +365,18 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
@@ -376,20 +386,10 @@ public class Item extends WorldObject
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
sb.append("(id: ");
|
||||
sb.append(_itemId);
|
||||
sb.append(" name: ");
|
||||
sb.append(getName());
|
||||
sb.append(")");
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the ownerID of the item
|
||||
@@ -562,19 +562,7 @@ public class Item extends WorldObject
|
||||
}
|
||||
}
|
||||
|
||||
if ((creator != null) && creator.isGM())
|
||||
{
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
if (Config.GMAUDIT)
|
||||
if ((creator != null) && creator.isGM() && Config.GMAUDIT)
|
||||
{
|
||||
final StringBuilder sb = new StringBuilder();
|
||||
sb.append(process);
|
||||
@@ -587,8 +575,20 @@ public class Item extends WorldObject
|
||||
sb.append(" count: ");
|
||||
sb.append(count);
|
||||
sb.append(")");
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
|
||||
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
|
||||
|
||||
String referenceName = "no-reference";
|
||||
if (reference instanceof WorldObject)
|
||||
{
|
||||
referenceName = (((WorldObject) reference).getName() != null ? ((WorldObject) reference).getName() : "no-name");
|
||||
}
|
||||
else if (reference instanceof String)
|
||||
{
|
||||
referenceName = (String) reference;
|
||||
}
|
||||
|
||||
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user