diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java index f7e67f4ca..967219cb3 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/ActionJsonSerializer.java @@ -48,13 +48,13 @@ public final class ActionJsonSerializer { .add("name", new JsonPrimitive(logEntry.getSource().getName())) ) .add("target", new JObject() - .add("type", new JsonPrimitive(logEntry.getTarget().getType().name()))) + .add("type", new JsonPrimitive(logEntry.getTarget().getType().name())) .consume(obj -> { if (logEntry.getTarget().getUniqueId().isPresent()) { obj.add("uniqueId", new JsonPrimitive(logEntry.getTarget().getUniqueId().get().toString())); } }) - .add("name", new JsonPrimitive(logEntry.getTarget().getName()) + .add("name", new JsonPrimitive(logEntry.getTarget().getName())) ) .add("description", new JsonPrimitive(logEntry.getDescription())) .toJson(); diff --git a/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java b/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java index 11e85ecd9..24b499aa4 100644 --- a/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java +++ b/common/src/main/java/me/lucko/luckperms/common/actionlog/LoggedAction.java @@ -158,7 +158,7 @@ public class LoggedAction implements Action { if (!(o instanceof Action)) return false; final Action that = (Action) o; - return getTimestamp() == that.getTimestamp() && + return getTimestamp().equals(that.getTimestamp()) && getSource().equals(that.getSource()) && getTarget().equals(that.getTarget()) && getDescription().equals(that.getDescription());