mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	WE unregistration + home/visit sorting + format
- WorldEdit listener unregistration for external masking/extent/async worldedit management. (wink) - Use the same listing for home and visit as previous behavior was confusing.
This commit is contained in:
		| @@ -21,6 +21,8 @@ | |||||||
| package com.intellectualcrafters.plot.commands; | package com.intellectualcrafters.plot.commands; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|  | import java.util.Iterator; | ||||||
|  | import java.util.Set; | ||||||
|  |  | ||||||
| import com.intellectualcrafters.plot.PS; | import com.intellectualcrafters.plot.PS; | ||||||
| import com.intellectualcrafters.plot.config.C; | import com.intellectualcrafters.plot.config.C; | ||||||
| @@ -51,7 +53,16 @@ public class Home extends SubCommand | |||||||
|     @Override |     @Override | ||||||
|     public boolean onCommand(final PlotPlayer plr, String[] args) |     public boolean onCommand(final PlotPlayer plr, String[] args) | ||||||
|     { |     { | ||||||
|         final ArrayList<Plot> plots = PS.get().sortPlotsByTemp(PS.get().getPlots(plr));//PS.get().sortPlots(PS.get().getPlots(plr), SortType.CREATION_DATE, null); |         final Set<Plot> all = PS.get().getPlots(plr); | ||||||
|  |         final Iterator<Plot> iter = all.iterator(); | ||||||
|  |         while (iter.hasNext()) | ||||||
|  |         { | ||||||
|  |             if (!iter.next().isBasePlot()) | ||||||
|  |             { | ||||||
|  |                 iter.remove(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |         final ArrayList<Plot> plots = PS.get().sortPlotsByTemp(all); | ||||||
|         if (plots.size() == 1) |         if (plots.size() == 1) | ||||||
|         { |         { | ||||||
|             MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(0)); |             MainUtil.teleportPlayer(plr, plr.getLocation(), plots.get(0)); | ||||||
|   | |||||||
| @@ -21,6 +21,7 @@ | |||||||
| package com.intellectualcrafters.plot.commands; | package com.intellectualcrafters.plot.commands; | ||||||
|  |  | ||||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||||
|  | import java.util.Iterator; | ||||||
| import java.util.List; | import java.util.List; | ||||||
| import java.util.UUID; | import java.util.UUID; | ||||||
|  |  | ||||||
| @@ -114,6 +115,14 @@ public class Visit extends SubCommand | |||||||
|         } |         } | ||||||
|  |  | ||||||
|         final Plot plot = plots.get(index); |         final Plot plot = plots.get(index); | ||||||
|  |         final Iterator<Plot> iter = plots.iterator(); | ||||||
|  |         while (iter.hasNext()) | ||||||
|  |         { | ||||||
|  |             if (!iter.next().isBasePlot()) | ||||||
|  |             { | ||||||
|  |                 iter.remove(); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|         if (!plot.hasOwner()) |         if (!plot.hasOwner()) | ||||||
|         { |         { | ||||||
|             if (!Permissions.hasPermission(plr, "plots.visit.unowned")) |             if (!Permissions.hasPermission(plr, "plots.visit.unowned")) | ||||||
|   | |||||||
| @@ -154,7 +154,8 @@ public class Plot | |||||||
|      * |      * | ||||||
|      * @param world |      * @param world | ||||||
|      * @param id |      * @param id | ||||||
|      * @return |      * @return | ||||||
|  |      */ | ||||||
|     public static Plot getPlot(final String world, final PlotId id) |     public static Plot getPlot(final String world, final PlotId id) | ||||||
|     { |     { | ||||||
|         return MainUtil.getPlot(world, id); |         return MainUtil.getPlot(world, id); | ||||||
| @@ -166,7 +167,8 @@ public class Plot | |||||||
|      * @see PlotPlayer#getCurrentPlot() if a player is expected here. |      * @see PlotPlayer#getCurrentPlot() if a player is expected here. | ||||||
|      * |      * | ||||||
|      * @param loc |      * @param loc | ||||||
|      * @return |      * @return | ||||||
|  |      */ | ||||||
|     public static Plot getPlot(final Location loc) |     public static Plot getPlot(final Location loc) | ||||||
|     { |     { | ||||||
|         return MainUtil.getPlot(loc); |         return MainUtil.getPlot(loc); | ||||||
|   | |||||||
| @@ -66,6 +66,9 @@ public class MainUtil | |||||||
|     public static short[][] x_loc; |     public static short[][] x_loc; | ||||||
|     public static short[][] y_loc; |     public static short[][] y_loc; | ||||||
|     public static short[][] z_loc; |     public static short[][] z_loc; | ||||||
|  |  | ||||||
|  |     /** | ||||||
|  |      * This cache is used for world generation and just saves a bit of calculation time when checking if something is in the plot area. | ||||||
|      */ |      */ | ||||||
|     public static void initCache() |     public static void initCache() | ||||||
|     { |     { | ||||||
|   | |||||||
| @@ -36,7 +36,7 @@ public class WESubscriber | |||||||
|         final WorldEdit worldedit = PS.get().worldedit; |         final WorldEdit worldedit = PS.get().worldedit; | ||||||
|         if (worldedit == null) |         if (worldedit == null) | ||||||
|         { |         { | ||||||
|             worldedit.getEventBus().unregister(this); |             WorldEdit.getInstance().getEventBus().unregister(this); | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|         final World worldObj = event.getWorld(); |         final World worldObj = event.getWorld(); | ||||||
|   | |||||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
		Reference in New Issue
	
	Block a user
	 boy0001
					boy0001