Fixing some more things

2025-07-18 05:14:42 +02:00 · 2015-07-31 00:25:16 +10:00
parent bfa877e607
commit e1dad77d8f
264 changed files with 6920 additions and 2146 deletions
--- a/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/ClusterFlagRemoveEvent.java
@ -20,12 +20,13 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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
 *
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerClaimPlotEvent.java
@ -20,12 +20,13 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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;
+
 /**
 * @author Citymonstret
 * @author Empire92
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerEnterPlotEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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;
+
 /**
 * @author Citymonstret
 * @author Empire92
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerLeavePlotEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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;
+
 /**
 * @author Citymonstret
 * @author Empire92
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotDeniedEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

-import java.util.UUID;
+import com.intellectualcrafters.plot.object.Plot;

 /**
 * @author Citymonstret
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotHelperEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

-import java.util.UUID;
+import com.intellectualcrafters.plot.object.Plot;

 /**
 * @author Empire92
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerPlotTrustedEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.Plot;
+import java.util.UUID;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

-import java.util.UUID;
+import com.intellectualcrafters.plot.object.Plot;

 /**
 * @author Citymonstret
--- a/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlayerTeleportToPlotEvent.java
@ -20,13 +20,14 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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
 *
--- a/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotClearEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

+import com.intellectualcrafters.plot.object.PlotId;
+
 /**
 * Called when a plot is cleared
 *
@ -38,7 +39,7 @@ public class PlotClearEvent extends Event implements Cancellable {
    private boolean cancelled;

    /**
-     * PlotDeleteEvent: Called when a plot is cleared
+     * PlotClearEvent: Called when a plot is cleared
     *
     * @param world The world in which the plot was cleared
     * @param id    The plot that was cleared
--- a/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotDeleteEvent.java
@ -20,10 +20,11 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.PlotId;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

+import com.intellectualcrafters.plot.object.PlotId;
+
 /**
 * Called when a plot is deleted
 *
--- a/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotEvent.java
@ -1,8 +1,9 @@
 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;
--- a/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotFlagAddEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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
 *
--- a/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotFlagRemoveEvent.java
@ -20,11 +20,12 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 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
 *
--- a/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotMergeEvent.java
@ -20,14 +20,15 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.Plot;
-import com.intellectualcrafters.plot.object.PlotId;
+import java.util.ArrayList;
+
 import org.bukkit.World;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

-import java.util.ArrayList;
+import com.intellectualcrafters.plot.object.Plot;
+import com.intellectualcrafters.plot.object.PlotId;

 /**
 * @author Empire92
--- a/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotRateEvent.java
@ -1,8 +1,10 @@
 package com.plotsquared.bukkit.events;

+import org.bukkit.event.HandlerList;
+
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
-import org.bukkit.event.HandlerList;
+import com.intellectualcrafters.plot.object.Rating;

 /**
 * Created 2015-07-13 for PlotSquaredGit
@ -13,9 +15,9 @@ public class PlotRateEvent extends PlotEvent {

    private static HandlerList handlers = new HandlerList();
    private final PlotPlayer rater;
-    private int rating;
+    private Rating rating;

-    public PlotRateEvent(final PlotPlayer rater, final int rating, final Plot plot) {
+    public PlotRateEvent(final PlotPlayer rater, final Rating rating, final Plot plot) {
        super(plot);
        this.rater = rater;
        this.rating = rating;
@ -29,11 +31,11 @@ public class PlotRateEvent extends PlotEvent {
        return this.rater;
    }

-    public void setRating(int rating) {
+    public void setRating(Rating rating) {
        this.rating = rating;
    }

-    public int getRating() {
+    public Rating getRating() {
        return this.rating;
    }

--- a/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java
+++ b/src/main/java/com/plotsquared/bukkit/events/PlotUnlinkEvent.java
@ -20,13 +20,14 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 package com.plotsquared.bukkit.events;

-import com.intellectualcrafters.plot.object.PlotId;
+import java.util.ArrayList;
+
 import org.bukkit.World;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

-import java.util.ArrayList;
+import com.intellectualcrafters.plot.object.PlotId;

 /**
 * @author Empire92