mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 09:33:43 +01:00 
			
		
		
		
	Compare commits
	
		
			9 Commits
		
	
	
		
			6.9.4
			...
			chore/v6/c
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 76e761fcf3 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 295b8a0135 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | fcc5bc5473 | ||
|   | 408b834376 | ||
|   | 986812b9e4 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 8d4333ad9d | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 9ff9097ff9 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 1ef424a2f1 | ||
|   | 9fd96dbaa2 | 
| @@ -109,6 +109,8 @@ import java.util.List; | |||||||
| import java.util.Objects; | import java.util.Objects; | ||||||
| import java.util.Set; | import java.util.Set; | ||||||
| import java.util.UUID; | import java.util.UUID; | ||||||
|  | import java.util.stream.Collectors; | ||||||
|  | import java.util.stream.Stream; | ||||||
|  |  | ||||||
| @SuppressWarnings("unused") | @SuppressWarnings("unused") | ||||||
| public class BlockEventListener implements Listener { | public class BlockEventListener implements Listener { | ||||||
| @@ -121,22 +123,10 @@ public class BlockEventListener implements Listener { | |||||||
|             Material.TURTLE_EGG, |             Material.TURTLE_EGG, | ||||||
|             Material.TURTLE_SPAWN_EGG |             Material.TURTLE_SPAWN_EGG | ||||||
|     ); |     ); | ||||||
|     private static final Set<Material> SNOW;  // needed as Tag.SNOW isn't present in 1.16.5 |     private static final Set<Material> SNOW = Stream.of(Material.values()) // needed as Tag.SNOW isn't present in 1.16.5 | ||||||
|  |             .filter(material -> material.name().contains("SNOW")) | ||||||
|     static { |             .filter(Material::isBlock) | ||||||
|         if (PlotSquared.platform().serverVersion()[1] < 17) { |             .collect(Collectors.toUnmodifiableSet()); | ||||||
|             SNOW = Set.of( |  | ||||||
|                     Material.SNOW, |  | ||||||
|                     Material.SNOW_BLOCK |  | ||||||
|             ); |  | ||||||
|         } else { |  | ||||||
|             SNOW = Set.of( |  | ||||||
|                     Material.SNOW, |  | ||||||
|                     Material.SNOW_BLOCK, |  | ||||||
|                     Material.POWDER_SNOW // only since 1.17 |  | ||||||
|             ); |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     private final PlotAreaManager plotAreaManager; |     private final PlotAreaManager plotAreaManager; | ||||||
|     private final WorldEdit worldEdit; |     private final WorldEdit worldEdit; | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ plugins { | |||||||
| } | } | ||||||
|  |  | ||||||
| group = "com.plotsquared" | group = "com.plotsquared" | ||||||
| version = "6.9.4" | version = "6.9.5-SNAPSHOT" | ||||||
|  |  | ||||||
| subprojects { | subprojects { | ||||||
|     group = rootProject.group |     group = rootProject.group | ||||||
| @@ -65,7 +65,7 @@ subprojects { | |||||||
|     } |     } | ||||||
|  |  | ||||||
|     dependencies { |     dependencies { | ||||||
|         implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.12")) |         implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.13")) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     dependencies { |     dependencies { | ||||||
| @@ -174,10 +174,7 @@ subprojects { | |||||||
|     tasks { |     tasks { | ||||||
|  |  | ||||||
|         compileJava { |         compileJava { | ||||||
|             options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000")) |             options.compilerArgs.add("-parameters") | ||||||
|             options.compilerArgs.add("-Xlint:all") |  | ||||||
|             for (disabledLint in arrayOf("processing", "path", "fallthrough", "serial")) |  | ||||||
|                 options.compilerArgs.add("-Xlint:$disabledLint") |  | ||||||
|             options.isDeprecation = true |             options.isDeprecation = true | ||||||
|             options.encoding = "UTF-8" |             options.encoding = "UTF-8" | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -8,13 +8,13 @@ spotbugs = "4.7.1" | |||||||
| worldedit = "7.2.12" | worldedit = "7.2.12" | ||||||
| placeholderapi = "2.11.2" | placeholderapi = "2.11.2" | ||||||
| luckperms = "5.4" | luckperms = "5.4" | ||||||
| essentialsx = "2.19.4" | essentialsx = "2.19.7" | ||||||
| mvdwapi = "3.1.1" | mvdwapi = "3.1.1" | ||||||
|  |  | ||||||
| # Third party | # Third party | ||||||
| prtree = "2.0.0" | prtree = "2.0.0" | ||||||
| aopalliance = "1.0" | aopalliance = "1.0" | ||||||
| cloud-services = "1.7.0" | cloud-services = "1.7.1" | ||||||
| arkitektonika = "2.1.1" | arkitektonika = "2.1.1" | ||||||
| squirrelid = "0.3.1" | squirrelid = "0.3.1" | ||||||
| http4j = "1.3" | http4j = "1.3" | ||||||
|   | |||||||
| @@ -1,6 +1,8 @@ | |||||||
| { | { | ||||||
|  |   "$schema": "https://docs.renovatebot.com/renovate-schema.json", | ||||||
|   "extends": [ |   "extends": [ | ||||||
|     "config:base" |     "config:base", | ||||||
|  |     ":semanticCommitsDisabled" | ||||||
|   ], |   ], | ||||||
|   "labels": ["Renovate"], |   "labels": ["Renovate"], | ||||||
|   "rebaseWhen": "conflicted" |   "rebaseWhen": "conflicted" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user