mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-22 06:03:45 +02:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			fix/ci/pub
			...
			fix/4647
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 141444de52 | ||
|   | 496b10747e | 
| @@ -600,7 +600,11 @@ public class PlayerEventListener implements Listener { | |||||||
|                     // i.e. untrusted-visit can override deny-teleport |                     // i.e. untrusted-visit can override deny-teleport | ||||||
|                     // this is acceptable, because otherwise it wouldn't make sense to have both flags set |                     // this is acceptable, because otherwise it wouldn't make sense to have both flags set | ||||||
|                     if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) { |                     if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) { | ||||||
|                         plotListener.plotEntry(pp, plot); |                         // returns false if the player is not allowed to enter the plot (if they are denied, for example) | ||||||
|  |                         // don't let the move event cancel the entry after teleport, but rather catch and cancel early (#4647) | ||||||
|  |                         if (!plotListener.plotEntry(pp, plot)) { | ||||||
|  |                             event.setCancelled(true); | ||||||
|  |                         } | ||||||
|                     } else { |                     } else { | ||||||
|                         pp.sendMessage( |                         pp.sendMessage( | ||||||
|                                 TranslatableCaption.of("deny.no_enter"), |                                 TranslatableCaption.of("deny.no_enter"), | ||||||
|   | |||||||
| @@ -206,14 +206,14 @@ tasks.getByName<Jar>("jar") { | |||||||
|     enabled = false |     enabled = false | ||||||
| } | } | ||||||
|  |  | ||||||
| val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4") | val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5") | ||||||
| tasks { | tasks { | ||||||
|     register("cacheLatestFaweArtifact") { |     register("cacheLatestFaweArtifact") { | ||||||
|         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL() |         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL() | ||||||
|         val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>) |         val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>) | ||||||
|                 .map { it as Map<*, *> } |                 .map { it as Map<*, *> } | ||||||
|                 .map { it["fileName"] as String } |                 .map { it["fileName"] as String } | ||||||
|                 .first { it -> it.contains("Bukkit") } |                 .first { it -> it.contains("Paper") } | ||||||
|         project.ext["faweArtifact"] = artifact |         project.ext["faweArtifact"] = artifact | ||||||
|     } |     } | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user