mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			feature/v6
			...
			renovate/a
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 90cc519778 | 
| @@ -80,8 +80,7 @@ final class DelegatePlotGenerator extends IndependentPlotGenerator { | |||||||
|                     result.setBiome(x, z, BukkitAdapter.adapt(biome)); |                     result.setBiome(x, z, BukkitAdapter.adapt(biome)); | ||||||
|                 } |                 } | ||||||
|  |  | ||||||
|                 //do not annotate with Override until we discontinue support for 1.4.4 (we no longer support 1.4.4) |                 //do not annotate with Override until we discontinue support for 1.4.4 | ||||||
|                 @Override |  | ||||||
|                 public void setBiome(int x, int y, int z, @NonNull Biome biome) { |                 public void setBiome(int x, int y, int z, @NonNull Biome biome) { | ||||||
|                     result.setBiome(x, z, BukkitAdapter.adapt(biome)); |                     result.setBiome(x, z, BukkitAdapter.adapt(biome)); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -51,7 +51,6 @@ import com.sk89q.worldedit.world.biome.BiomeType; | |||||||
| import com.sk89q.worldedit.world.block.BaseBlock; | import com.sk89q.worldedit.world.block.BaseBlock; | ||||||
| import com.sk89q.worldedit.world.block.BlockState; | import com.sk89q.worldedit.world.block.BlockState; | ||||||
| import org.bukkit.Bukkit; | import org.bukkit.Bukkit; | ||||||
| import org.bukkit.Chunk; |  | ||||||
| import org.bukkit.block.Block; | import org.bukkit.block.Block; | ||||||
| import org.bukkit.block.Container; | import org.bukkit.block.Container; | ||||||
| import org.bukkit.block.data.BlockData; | import org.bukkit.block.data.BlockData; | ||||||
| @@ -267,13 +266,7 @@ public class BukkitQueueCoordinator extends BasicQueueCoordinator { | |||||||
|         } catch (WorldEditException ignored) { |         } catch (WorldEditException ignored) { | ||||||
|             // Fallback to not so nice method |             // Fallback to not so nice method | ||||||
|             BlockData blockData = BukkitAdapter.adapt(block); |             BlockData blockData = BukkitAdapter.adapt(block); | ||||||
|             Block existing; |             Block existing = getBukkitWorld().getBlockAt(x, y, z); | ||||||
|             // Assume a chunk object has been given only when it should have been. |  | ||||||
|             if (getChunkObject() instanceof Chunk chunkObject) { |  | ||||||
|                 existing = chunkObject.getBlock(x & 15, y, z & 15); |  | ||||||
|             } else { |  | ||||||
|                  existing = getBukkitWorld().getBlockAt(x, y, z); |  | ||||||
|             } |  | ||||||
|             final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData()); |             final BlockState existingBaseBlock = BukkitAdapter.adapt(existing.getBlockData()); | ||||||
|             if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) { |             if (BukkitBlockUtil.get(existing).equals(existingBaseBlock) && existing.getBlockData().matches(blockData)) { | ||||||
|                 return; |                 return; | ||||||
|   | |||||||
| @@ -889,8 +889,8 @@ public class PlotSquared { | |||||||
|                             e.printStackTrace(); |                             e.printStackTrace(); | ||||||
|                         } |                         } | ||||||
|                         LOGGER.info("| generator: {}>{}", baseGenerator, areaGen); |                         LOGGER.info("| generator: {}>{}", baseGenerator, areaGen); | ||||||
|                         LOGGER.info("| plot world: {}", pa.getClass().getCanonicalName()); |                         LOGGER.info("| plot world: {}", pa); | ||||||
|                         LOGGER.info("| manager: {}", pa.getPlotManager().getClass().getCanonicalName()); |                         LOGGER.info("| manager: {}", pa); | ||||||
|                         LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name); |                         LOGGER.info("Note: Area created for cluster '{}' (invalid or old configuration?)", name); | ||||||
|                         areaGen.getPlotGenerator().initialize(pa); |                         areaGen.getPlotGenerator().initialize(pa); | ||||||
|                         areaGen.augment(pa); |                         areaGen.augment(pa); | ||||||
| @@ -906,13 +906,6 @@ public class PlotSquared { | |||||||
|                     throw new IllegalArgumentException("Invalid Generator: " + gen_string); |                     throw new IllegalArgumentException("Invalid Generator: " + gen_string); | ||||||
|                 } |                 } | ||||||
|                 PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null); |                 PlotArea pa = areaGen.getPlotGenerator().getNewPlotArea(world, null, null, null); | ||||||
|                 LOGGER.info("- generator: {}>{}", baseGenerator, areaGen); |  | ||||||
|                 LOGGER.info("- plot world: {}", pa.getClass().getCanonicalName()); |  | ||||||
|                 LOGGER.info("- plot area manager: {}", pa.getPlotManager().getClass().getCanonicalName()); |  | ||||||
|                 if (!this.worldConfiguration.contains(path)) { |  | ||||||
|                     this.worldConfiguration.createSection(path); |  | ||||||
|                     worldSection = this.worldConfiguration.getConfigurationSection(path); |  | ||||||
|                 } |  | ||||||
|                 pa.saveConfiguration(worldSection); |                 pa.saveConfiguration(worldSection); | ||||||
|                 pa.loadDefaultConfiguration(worldSection); |                 pa.loadDefaultConfiguration(worldSection); | ||||||
|                 try { |                 try { | ||||||
| @@ -920,6 +913,9 @@ public class PlotSquared { | |||||||
|                 } catch (IOException e) { |                 } catch (IOException e) { | ||||||
|                     e.printStackTrace(); |                     e.printStackTrace(); | ||||||
|                 } |                 } | ||||||
|  |                 LOGGER.info("- generator: {}>{}", baseGenerator, areaGen); | ||||||
|  |                 LOGGER.info("- plot world: {}", pa); | ||||||
|  |                 LOGGER.info("- plot area manager: {}", pa.getPlotManager()); | ||||||
|                 areaGen.getPlotGenerator().initialize(pa); |                 areaGen.getPlotGenerator().initialize(pa); | ||||||
|                 areaGen.augment(pa); |                 areaGen.augment(pa); | ||||||
|                 addPlotArea(pa); |                 addPlotArea(pa); | ||||||
|   | |||||||
| @@ -143,8 +143,7 @@ public abstract class QueueCoordinator { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     /** |     /** | ||||||
|      * Set a chunk object (e.g. the Bukkit Chunk object) to the queue. This will be used as fallback in case of WNA failure. |      * Set a chunk object (e.g. the Bukkit Chunk object) to the queue | ||||||
|      * Should ONLY be used in specific cases (i.e. generation, where a chunk is being populated) |  | ||||||
|      * |      * | ||||||
|      * @param chunkObject chunk object. Usually the implementation-specific chunk (e.g. bukkit Chunk) |      * @param chunkObject chunk object. Usually the implementation-specific chunk (e.g. bukkit Chunk) | ||||||
|      */ |      */ | ||||||
|   | |||||||
| @@ -14,7 +14,7 @@ snakeyaml = "1.30" # Version set by Bukkit | |||||||
| # Adventure & MiniMessage | # Adventure & MiniMessage | ||||||
| adventure-api = "4.9.3" | adventure-api = "4.9.3" | ||||||
| adventure-text-minimessage = "4.1.0-SNAPSHOT" | adventure-text-minimessage = "4.1.0-SNAPSHOT" | ||||||
| adventure-platform-bukkit = "4.0.1" | adventure-platform-bukkit = "4.1.0" | ||||||
|  |  | ||||||
| # Plugins | # Plugins | ||||||
| worldedit = "7.2.10" | worldedit = "7.2.10" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user