Major code reformatting

Bukkit/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java

@@ -20,13 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.PlotCluster;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.PlotCluster;
-
 /**
  * Called when a flag is removed from a plot
  *
@@ -34,56 +33,57 @@ import com.intellectualcrafters.plot.object.PlotCluster;
 
  */
 public class ClusterFlagRemoveEvent extends Event implements Cancellable {
-    private static HandlerList handlers = new HandlerList();
+
+    private static final HandlerList handlers = new HandlerList();
     private final PlotCluster cluster;
     private final Flag flag;
     private boolean cancelled;
-    
+
     /**
      * PlotFlagRemoveEvent: Called when a flag is removed from a plot
      *
      * @param flag Flag that was removed
      * @param cluster PlotCluster from which the flag was removed
      */
-    public ClusterFlagRemoveEvent(final Flag flag, final PlotCluster cluster) {
+    public ClusterFlagRemoveEvent(Flag flag, PlotCluster cluster) {
         this.cluster = cluster;
         this.flag = flag;
     }
-    
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-    
+
     /**
      * Get the cluster involved
      *
      * @return PlotCluster
      */
     public PlotCluster getCluster() {
-        return cluster;
+        return this.cluster;
     }
-    
+
     /**
      * Get the flag involved
      *
      * @return Flag
      */
     public Flag getFlag() {
-        return flag;
+        return this.flag;
     }
-    
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-    
+
     @Override
     public boolean isCancelled() {
-        return cancelled;
+        return this.cancelled;
     }
-    
+
     @Override
-    public void setCancelled(final boolean b) {
-        cancelled = b;
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java

@@ -20,65 +20,67 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
+/**
+
 
-/**
  */
 public class PlayerClaimPlotEvent extends PlayerEvent implements Cancellable {
- */
+
+    private static final HandlerList handlers = new HandlerList();
     private final Plot plot;
     private final boolean auto;
     private boolean cancelled;
-    private final boolean auto;
+
     /**
      * PlayerClaimPlotEvent: Called when a plot is claimed
      *
      * @param player Player that claimed the plot
      * @param plot   Plot that was claimed
      */
-     * @param plot   Plot that was claimed
+    public PlayerClaimPlotEvent(Player player, Plot plot, boolean auto) {
         super(player);
         this.plot = plot;
         this.auto = auto;
     }
-        this.auto = auto;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
     public Plot getPlot() {
-     */
+        return this.plot;
     }
-        return plot;
+
     /**
      * @return true if it was an automated claim, else false
      */
     public boolean wasAuto() {
-     */
+        return this.auto;
     }
-        return auto;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-        return handlers;
+
     @Override
     public boolean isCancelled() {
-    @Override
+        return this.cancelled;
     }
-        return cancelled;
+
     @Override
-    
-    @Override
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java

@@ -20,42 +20,44 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
+/**
+
 
-/**
  */
 public class PlayerEnterPlotEvent extends PlayerEvent {
- */
+
+    private static final HandlerList handlers = new HandlerList();
     private final Plot plot;
-    private static HandlerList handlers = new HandlerList();
+
     /**
      * PlayerEnterPlotEvent: Called when a player leaves a plot
      *
      * @param player Player that entered the plot
      * @param plot   Plot that was entered
      */
-     * @param plot   Plot that was entered
+    public PlayerEnterPlotEvent(Player player, Plot plot) {
         super(player);
         this.plot = plot;
     }
-        this.plot = plot;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
     public Plot getPlot() {
-     */
+        return this.plot;
     }
-        return plot;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java

@@ -20,43 +20,44 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Plot;
+/**
+
 
-/**
  */
 public class PlayerLeavePlotEvent extends PlayerEvent {
- */
-public class PlayerLeavePlotEvent extends PlayerEvent {
+
+    private static final HandlerList handlers = new HandlerList();
     private final Plot plot;
-    private static HandlerList handlers = new HandlerList();
+
     /**
      * PlayerLeavePlotEvent: Called when a player leaves a plot
      *
      * @param player Player that left the plot
      * @param plot   Plot that was left
      */
-     * @param plot   Plot that was left
+    public PlayerLeavePlotEvent(Player player, Plot plot) {
         super(player);
         this.plot = plot;
     }
-        this.plot = plot;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
     public Plot getPlot() {
-     */
+        return this.plot;
     }
-        return plot;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java

@@ -20,22 +20,23 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
+
+/**
+
 
-/**
  */
 public class PlayerPlotDeniedEvent extends PlotEvent {
- */
-public class PlayerPlotDeniedEvent extends PlotEvent {
+
+    private static final HandlerList handlers = new HandlerList();
     private final Player initiator;
     private final boolean added;
     private final UUID player;
-    private final boolean added;
+
     /**
      * PlayerPlotDeniedEvent: Called when the denied UUID list is modified for a plot
      *
@@ -44,44 +45,44 @@ public class PlayerPlotDeniedEvent extends PlotEvent {
      * @param player    Player that was denied/un-denied
      * @param added     true of add to deny list, false if removed
      */
-     * @param added     true of add to deny list, false if removed
+    public PlayerPlotDeniedEvent(Player initiator, Plot plot, UUID player, boolean added) {
         super(plot);
         this.initiator = initiator;
         this.added = added;
         this.player = player;
     }
-        this.player = player;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * If a user was added
      *
      * @return boolean
      */
     public boolean wasAdded() {
-     */
+        return this.added;
     }
-        return added;
+
     /**
      * The player added/removed
      *
      * @return UUID
      */
     public UUID getPlayer() {
-     */
+        return this.player;
     }
-        return player;
+
     /**
      * The player initiating the action
      *
      * @return Player
      */
     public Player getInitiator() {
-     */
+        return this.initiator;
     }
-        return initiator;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java

@@ -20,22 +20,23 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
+
+/**
+
 
-/**
  */
 public class PlayerPlotHelperEvent extends PlotEvent {
- */
-public class PlayerPlotHelperEvent extends PlotEvent {
+
+    private static final HandlerList handlers = new HandlerList();
     private final Player initiator;
     private final boolean added;
     private final UUID player;
-    private final boolean added;
+
     /**
      * PlayerPlotHelperEvent: Called when a plot helper is added/removed
      *
@@ -44,44 +45,44 @@ public class PlayerPlotHelperEvent extends PlotEvent {
      * @param player    Player that was added/removed from the helper list
      * @param added     true of the player was added, false if the player was removed
      */
-     * @param added     true of the player was added, false if the player was removed
+    public PlayerPlotHelperEvent(Player initiator, Plot plot, UUID player, boolean added) {
         super(plot);
         this.initiator = initiator;
         this.added = added;
         this.player = player;
     }
-        this.player = player;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * If a player was added
      *
      * @return boolean
      */
     public boolean wasAdded() {
-     */
+        return this.added;
     }
-        return added;
+
     /**
      * The UUID added/removed
      *
      * @return UUID
      */
     public UUID getPlayer() {
-     */
+        return this.player;
     }
-        return player;
+
     /**
      * The player initiating the action
      *
      * @return Player
      */
     public Player getInitiator() {
-     */
+        return this.initiator;
     }
-        return initiator;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java

@@ -20,22 +20,23 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
-import java.util.UUID;
-
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
+
+/**
+
 
-/**
  */
 public class PlayerPlotTrustedEvent extends PlotEvent {
- */
-public class PlayerPlotTrustedEvent extends PlotEvent {
+
+    private static final HandlerList handlers = new HandlerList();
     private final Player initiator;
     private final boolean added;
     private final UUID player;
-    private final boolean added;
+
     /**
      * PlayerPlotTrustedEvent: Called when a plot trusted user is added/removed
      *
@@ -44,44 +45,44 @@ public class PlayerPlotTrustedEvent extends PlotEvent {
      * @param player    Player that was added/removed from the trusted list
      * @param added     true of the player was added, false if the player was removed
      */
-     * @param added     true of the player was added, false if the player was removed
+    public PlayerPlotTrustedEvent(Player initiator, Plot plot, UUID player, boolean added) {
         super(plot);
         this.initiator = initiator;
         this.added = added;
         this.player = player;
     }
-        this.player = player;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * If a player was added
      *
      * @return boolean
      */
     public boolean wasAdded() {
-     */
+        return this.added;
     }
-        return added;
+
     /**
      * The UUID added/removed
      *
      * @return UUID
      */
     public UUID getPlayer() {
-     */
+        return this.player;
     }
-        return player;
+
     /**
      * The player initiating the action
      *
      * @return Player
      */
     public Player getInitiator() {
-     */
+        return this.initiator;
     }
-        return initiator;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java

@@ -20,24 +20,26 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.object.Location;
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.player.PlayerEvent;
 
-import com.intellectualcrafters.plot.object.Location;
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Called when a player teleports to a plot
- *
+ *
+
+
  */
 public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellable {
+
     private static final HandlerList handlers = new HandlerList();
     private final Location from;
     private final Plot plot;
     private boolean cancelled;
-    private final Plot plot;
+
     /**
      * PlayerTeleportToPlotEvent: Called when a player teleports to a plot
      *
@@ -45,46 +47,46 @@ public class PlayerTeleportToPlotEvent extends PlayerEvent implements Cancellabl
      * @param from   Start location
      * @param plot   Plot to which the player was teleported
      */
-     * @param plot   Plot to which the player was teleported
+    public PlayerTeleportToPlotEvent(Player player, Location from, Plot plot) {
         super(player);
         this.from = from;
         this.plot = plot;
     }
-        this.plot = plot;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the from location
      *
      * @return Location
      */
     public Location getFrom() {
-     */
+        return this.from;
     }
-        return from;
+
     /**
      * Get the plot involved
      *
      * @return Plot
      */
     public Plot getPlot() {
-     */
+        return this.plot;
     }
-        return plot;
+
     @Override
     public boolean isCancelled() {
-    @Override
+        return this.cancelled;
     }
-        return cancelled;
+
     @Override
-    
+    public void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java

@@ -20,28 +20,29 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
-
 /**
  * Called when a plot is cleared
- *
+ *
+
+
  */
 public class PlotClearEvent extends PlotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private boolean cancelled;
     public PlotClearEvent(Plot plot) {
         super(plot);
     }
 
-    }
-
-    private static HandlerList handlers = new HandlerList();
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the PlotId
      *
@@ -50,7 +51,7 @@ public class PlotClearEvent extends PlotEvent implements Cancellable {
     public PlotId getPlotId() {
         return getPlot().getId();
     }
-        return getPlot().getId();
+
     /**
      * Get the world name
      *
@@ -59,19 +60,19 @@ public class PlotClearEvent extends PlotEvent implements Cancellable {
     public String getWorld() {
         return getPlot().getArea().worldname;
     }
-        return getPlot().getArea().worldname;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-        return handlers;
+
     @Override
     public boolean isCancelled() {
-    @Override
+        return this.cancelled;
     }
-        return cancelled;
+
     @Override
-    
-    @Override
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java

@@ -20,26 +20,28 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
-import org.bukkit.event.HandlerList;
-
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
+import org.bukkit.event.HandlerList;
 
 /**
  * Called when a plot is deleted
- *
+ *
+
+
  */
 public class PlotDeleteEvent extends PlotEvent {
+
+    private static final HandlerList handlers = new HandlerList();
+
     public PlotDeleteEvent(Plot plot) {
         super(plot);
     }
 
-    }
-
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the PlotId
      *
@@ -48,7 +50,7 @@ public class PlotDeleteEvent extends PlotEvent {
     public PlotId getPlotId() {
         return getPlot().getId();
     }
-        return getPlot().getId();
+
     /**
      * Get the world name
      *
@@ -57,7 +59,7 @@ public class PlotDeleteEvent extends PlotEvent {
     public String getWorld() {
         return getPlot().getArea().worldname;
     }
-        return getPlot().getArea().worldname;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java

@@ -1,19 +1,18 @@
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.event.Event;
 
-import com.intellectualcrafters.plot.object.Plot;
-
 public abstract class PlotEvent extends Event {
-    
+
     private final Plot plot;
-    
-    public PlotEvent(final Plot plot) {
+
+    public PlotEvent(Plot plot) {
         this.plot = plot;
     }
-    
+
     public final Plot getPlot() {
-        return plot;
+        return this.plot;
     }
-    
+
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java

@@ -20,58 +20,59 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Called when a Flag is added to a plot
- *
+ *
+
+
  */
 public class PlotFlagAddEvent extends PlotEvent implements Cancellable {
- */
-public class PlotFlagAddEvent extends PlotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
     private final Flag flag;
     private boolean cancelled;
-    private final Flag flag;
+
     /**
      * PlotFlagAddEvent: Called when a Flag is added to a plot
      *
      * @param flag Flag that was added
      * @param plot Plot to which the flag was added
      */
-     * @param plot Plot to which the flag was added
+    public PlotFlagAddEvent(Flag flag, Plot plot) {
         super(plot);
         this.flag = flag;
     }
-        this.flag = flag;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the flag involved
      *
      * @return Flag
      */
     public Flag getFlag() {
-     */
+        return this.flag;
     }
-        return flag;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-        return handlers;
+
     @Override
     public final boolean isCancelled() {
-    @Override
+        return this.cancelled;
     }
-        return cancelled;
+
     @Override
-    
+    public final void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java

@@ -20,58 +20,59 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
+import com.intellectualcrafters.plot.flag.Flag;
+import com.intellectualcrafters.plot.object.Plot;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.flag.Flag;
-import com.intellectualcrafters.plot.object.Plot;
-
 /**
  * Called when a flag is removed from a plot
- *
+ *
+
+
  */
 public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable {
- */
-public class PlotFlagRemoveEvent extends PlotEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
     private final Flag flag;
     private boolean cancelled;
-    private final Flag flag;
+
     /**
      * PlotFlagRemoveEvent: Called when a flag is removed from a plot
      *
      * @param flag Flag that was removed
      * @param plot Plot from which the flag was removed
      */
-     * @param plot Plot from which the flag was removed
+    public PlotFlagRemoveEvent(Flag flag, Plot plot) {
         super(plot);
         this.flag = flag;
     }
-        this.flag = flag;
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-        return handlers;
+
     /**
      * Get the flag involved
      *
      * @return Flag
      */
     public Flag getFlag() {
-     */
+        return this.flag;
     }
-        return flag;
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-        return handlers;
+
     @Override
     public final boolean isCancelled() {
-    @Override
+        return this.cancelled;
     }
-        return cancelled;
+
     @Override
-    
+    public final void setCancelled(boolean cancelled) {
         this.cancelled = cancelled;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java

@@ -20,25 +20,26 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
-import java.util.ArrayList;
-
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.World;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
+import java.util.ArrayList;
+
+/**
 
-/**
  */
 public class PlotMergeEvent extends Event implements Cancellable {
-public class PlotMergeEvent extends Event implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
     private final ArrayList<PlotId> plots;
     private boolean cancelled;
     private Plot plot;
     private World world;
-    private World world;
+
     /**
      * PlotMergeEvent: Called when plots are merged
      *
@@ -46,48 +47,48 @@ public class PlotMergeEvent extends Event implements Cancellable {
      * @param plot  Plot that was merged
      * @param plots A list of plots involved in the event
      */
-     */
+    public PlotMergeEvent(World world, Plot plot, ArrayList<PlotId> plots) {
         this.plots = plots;
     }
-    }
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-    }
+
     /**
      * Get the plots being added;
      *
      * @return Plot
      */
     public ArrayList<PlotId> getPlots() {
-    public ArrayList<PlotId> getPlots() {
+        return this.plots;
     }
-    }
+
     /**
      * Get the main plot
      *
      * @return Plot
      */
     public Plot getPlot() {
-    public Plot getPlot() {
+        return this.plot;
     }
-    }
+
     public World getWorld() {
-    public World getWorld() {
+        return this.world;
     }
-    }
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-    }
+
     @Override
     public boolean isCancelled() {
-    public boolean isCancelled() {
+        return this.cancelled;
     }
-    }
+
     @Override
-    @Override
-    public void setCancelled(final boolean b) {
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
     }
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java

@@ -1,46 +1,46 @@
 package com.plotsquared.bukkit.events;
 
-import org.bukkit.event.HandlerList;
-
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.Rating;
+import org.bukkit.event.HandlerList;
 
 /**
  * Created 2015-07-13 for PlotSquaredGit
- *
+ *
+
  */
 public class PlotRateEvent extends PlotEvent {
-public class PlotRateEvent extends PlotEvent {
-    
+
+    private static final HandlerList handlers = new HandlerList();
     private final PlotPlayer rater;
     private Rating rating;
-    private Rating rating;
-    
+
+    public PlotRateEvent(PlotPlayer rater, Rating rating, Plot plot) {
         super(plot);
         this.rater = rater;
         this.rating = rating;
     }
-    }
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-    }
+
     public PlotPlayer getRater() {
-    public PlotPlayer getRater() {
+        return this.rater;
     }
-    }
-    
+
+    public Rating getRating() {
+        return this.rating;
+    }
+
+    public void setRating(Rating rating) {
         this.rating = rating;
     }
-    }
-    
-    public Rating getRating() {
-        return rating;
-    }
+
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-    }
+
 }

Bukkit/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java

@@ -20,70 +20,71 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;
 
-import java.util.ArrayList;
-
+import com.intellectualcrafters.plot.object.PlotArea;
+import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.World;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import com.intellectualcrafters.plot.object.PlotArea;
-import com.intellectualcrafters.plot.object.PlotId;
+import java.util.ArrayList;
+
+/**
 
-/**
  */
 public class PlotUnlinkEvent extends Event implements Cancellable {
-public class PlotUnlinkEvent extends Event implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
     private final ArrayList<PlotId> plots;
     private final World world;
-    private final World world;
     private final PlotArea area;
-    private final PlotArea area;
+    private boolean cancelled;
+
     /**
      * Called when a mega-plot is unlinked.
      *
      * @param world World in which the event occurred
      * @param plots Plots that are involved in the event
      */
-     */
+    public PlotUnlinkEvent(World world, PlotArea area, ArrayList<PlotId> plots) {
         this.plots = plots;
         this.world = world;
         this.area = area;
     }
-    }
+
     public static HandlerList getHandlerList() {
         return handlers;
     }
-    }
+
     /**
      * Get the plots involved
      *
      * @return PlotId
      */
     public ArrayList<PlotId> getPlots() {
-    public ArrayList<PlotId> getPlots() {
+        return this.plots;
     }
-    }
+
     public World getWorld() {
-    public World getWorld() {
+        return this.world;
     }
-    }
+
     public PlotArea getArea() {
-    public PlotArea getArea() {
+        return this.area;
     }
 
     @Override
     public HandlerList getHandlers() {
         return handlers;
     }
-    }
+
     @Override
     public boolean isCancelled() {
-    public boolean isCancelled() {
+        return this.cancelled;
     }
-    }
+
     @Override
-    @Override
-    public void setCancelled(final boolean b) {
+    public void setCancelled(boolean b) {
+        this.cancelled = b;
     }
 }