Java 7 and make intellij happy

2017-12-19 02:18:13 -08:00
parent ce132ed033
commit 3b644cd6c3
53 changed files with 222 additions and 285 deletions
--- a/src/main/java/com/massivecraft/factions/event/FPlayerLeaveEvent.java
+++ b/src/main/java/com/massivecraft/factions/event/FPlayerLeaveEvent.java
@@ -34,10 +34,7 @@ public class FPlayerLeaveEvent extends FactionPlayerEvent implements Cancellable

    @Override
    public void setCancelled(boolean c) {
-        if (reason == PlayerLeaveReason.DISBAND || reason == PlayerLeaveReason.RESET) {
-            cancelled = false; // Don't let them cancel factions disbanding.
-        } else {
-            cancelled = c;
-        }
+        // Don't let them cancel factions disbanding.
+        cancelled = reason != PlayerLeaveReason.DISBAND && reason != PlayerLeaveReason.RESET && c;
    }
 }