lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved GM audit calculations after configuration is checked.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-09-28 01:09:10 +00:00
parent 36e37d437f
commit e1dfafbf7e
54 changed files with 1674 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/ItemTable.java
View File

@@ -355,8 +355,22 @@ public class ItemTable
}
}
if ((actor != null) && actor.isGM())
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
{
final StringBuilder sb = new StringBuilder();
sb.append(process);
sb.append("(id: ");
sb.append(itemId);
sb.append(" count: ");
sb.append(count);
sb.append(" name: ");
sb.append(item.getItemName());
sb.append(" objId: ");
sb.append(item.getObjectId());
sb.append(")");
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
String referenceName = "no-reference";
if (reference instanceof WorldObject)
{
@@ -366,22 +380,8 @@ public class ItemTable
{
referenceName = (String) reference;
}
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
final StringBuilder sb = new StringBuilder();
sb.append(process);
sb.append("(id: ");
sb.append(itemId);
sb.append(" count: ");
sb.append(count);
sb.append(" name: ");
sb.append(item.getItemName());
sb.append(" objId: ");
sb.append(item.getObjectId());
sb.append(")");
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
}
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
}
// Notify to scripts
@@ -469,8 +469,20 @@ public class ItemTable
}
}
if ((actor != null) && actor.isGM())
if ((actor != null) && actor.isGM() && Config.GMAUDIT)
{
final StringBuilder sb = new StringBuilder();
sb.append(process);
sb.append("(id: ");
sb.append(item.getId());
sb.append(" count: ");
sb.append(item.getCount());
sb.append(" itemObjId: ");
sb.append(item.getObjectId());
sb.append(")");
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
String referenceName = "no-reference";
if (reference instanceof WorldObject)
{
@@ -480,20 +492,8 @@ public class ItemTable
{
referenceName = (String) reference;
}
final String targetName = (actor.getTarget() != null ? actor.getTarget().getName() : "no-target");
if (Config.GMAUDIT)
{
final StringBuilder sb = new StringBuilder();
sb.append(process);
sb.append("(id: ");
sb.append(item.getId());
sb.append(" count: ");
sb.append(item.getCount());
sb.append(" itemObjId: ");
sb.append(item.getObjectId());
sb.append(")");
GMAudit.auditGMAction(actor.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
}
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

60
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/item/instance/Item.java
View File

@@ -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,18 +386,8 @@ 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));
}
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
}
}
@@ -562,8 +562,22 @@ 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(" objId: ");
sb.append(getObjectId());
sb.append(" name: ");
sb.append(getName());
sb.append(" count: ");
sb.append(count);
sb.append(")");
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
String referenceName = "no-reference";
if (reference instanceof WorldObject)
{
@@ -573,22 +587,8 @@ 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(" objId: ");
sb.append(getObjectId());
sb.append(" name: ");
sb.append(getName());
sb.append(" count: ");
sb.append(count);
sb.append(")");
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
}
GMAudit.auditGMAction(creator.toString(), sb.toString(), targetName, StringUtil.concat("Object referencing this action is: ", referenceName));
}
}