From 269aa393789a943c54b57aa418262450ff397013 Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Sun, 20 Aug 2017 14:51:46 +0200
Subject: [PATCH] Fix comparator and ensure @Nonnull annotated methods never
 return null in LogEntry

---
 .../java/me/lucko/luckperms/api/LogEntry.java | 19 +++++++++++--------
 .../messaging/AbstractMessagingService.java   |  2 +-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/api/src/main/java/me/lucko/luckperms/api/LogEntry.java b/api/src/main/java/me/lucko/luckperms/api/LogEntry.java
index f2918656d..864698e92 100644
--- a/api/src/main/java/me/lucko/luckperms/api/LogEntry.java
+++ b/api/src/main/java/me/lucko/luckperms/api/LogEntry.java
@@ -48,8 +48,11 @@ public class LogEntry implements Comparable<LogEntry> {
             .thenComparing(LogEntry::getActor)
             .thenComparing(LogEntry::getActorName, String.CASE_INSENSITIVE_ORDER)
             .thenComparing(LogEntry::getEntryType)
-            .thenComparing(Comparator.nullsFirst(Comparator.comparing(LogEntry::getActed)))
-            .thenComparing(LogEntry::getActorName, String.CASE_INSENSITIVE_ORDER)
+            .thenComparing(e -> {
+                UUID u = e.getActed();
+                return u == null ? "" : u.toString();
+            })
+            .thenComparing(LogEntry::getActedName, String.CASE_INSENSITIVE_ORDER)
             .thenComparing(LogEntry::getAction);
 
     /**
@@ -219,7 +222,7 @@ public class LogEntry implements Comparable<LogEntry> {
 
     @Nonnull
     public UUID getActor() {
-        return actor;
+        return Preconditions.checkNotNull(actor, "actor");
     }
 
     void setActor(@Nonnull UUID actor) {
@@ -228,7 +231,7 @@ public class LogEntry implements Comparable<LogEntry> {
 
     @Nonnull
     public String getActorName() {
-        return actorName;
+        return Preconditions.checkNotNull(actorName, "actorName");
     }
 
     void setActorName(@Nonnull String actorName) {
@@ -243,7 +246,7 @@ public class LogEntry implements Comparable<LogEntry> {
      */
     @Nonnull
     public Type getEntryType() {
-        return type;
+        return Preconditions.checkNotNull(type, "type");
     }
 
     /**
@@ -264,7 +267,7 @@ public class LogEntry implements Comparable<LogEntry> {
      */
     @Deprecated
     public char getType() {
-        return type.getCode();
+        return getEntryType().getCode();
     }
 
     /**
@@ -289,7 +292,7 @@ public class LogEntry implements Comparable<LogEntry> {
 
     @Nonnull
     public String getActedName() {
-        return actedName;
+        return Preconditions.checkNotNull(actedName, "actedName");
     }
 
     void setActedName(@Nonnull String actedName) {
@@ -298,7 +301,7 @@ public class LogEntry implements Comparable<LogEntry> {
 
     @Nonnull
     public String getAction() {
-        return action;
+        return Preconditions.checkNotNull(action, "action");
     }
 
     void setAction(@Nonnull String action) {
diff --git a/common/src/main/java/me/lucko/luckperms/common/messaging/AbstractMessagingService.java b/common/src/main/java/me/lucko/luckperms/common/messaging/AbstractMessagingService.java
index 398ce9dbc..a68aa46be 100644
--- a/common/src/main/java/me/lucko/luckperms/common/messaging/AbstractMessagingService.java
+++ b/common/src/main/java/me/lucko/luckperms/common/messaging/AbstractMessagingService.java
@@ -61,7 +61,7 @@ public abstract class AbstractMessagingService implements InternalMessagingServi
     private final Gson gson = new Gson();
 
     @Getter
-    private final BufferedRequest<Void> updateBuffer = new BufferedRequest<Void>(10000L, r -> getPlugin().doAsync(r)) {
+    private final BufferedRequest<Void> updateBuffer = new BufferedRequest<Void>(3000L, r -> getPlugin().doAsync(r)) {
         @Override
         protected Void perform() {
             pushUpdate();