mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			fix/disabl
			...
			reproducib
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 8582903015 | 
							
								
								
									
										2
									
								
								.github/workflows/build-pr.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build-pr.yml
									
									
									
									
										vendored
									
									
								
							| @@ -11,7 +11,7 @@ jobs: | ||||
|       - name: Checkout Repository | ||||
|         uses: actions/checkout@v4 | ||||
|       - name: Validate Gradle Wrapper | ||||
|         uses: gradle/actions/wrapper-validation@v3 | ||||
|         uses: gradle/wrapper-validation-action@v3 | ||||
|       - name: Setup Java | ||||
|         uses: actions/setup-java@v4 | ||||
|         with: | ||||
|   | ||||
							
								
								
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -11,7 +11,7 @@ jobs: | ||||
|       - name: Checkout Repository | ||||
|         uses: actions/checkout@v4 | ||||
|       - name: Validate Gradle Wrapper | ||||
|         uses: gradle/actions/wrapper-validation@v3 | ||||
|         uses: gradle/wrapper-validation-action@v3 | ||||
|       - name: Setup Java | ||||
|         uses: actions/setup-java@v4 | ||||
|         with: | ||||
|   | ||||
| @@ -24,6 +24,7 @@ import com.google.inject.Injector; | ||||
| import com.google.inject.Key; | ||||
| import com.google.inject.Singleton; | ||||
| import com.google.inject.Stage; | ||||
| import com.google.inject.TypeLiteral; | ||||
| import com.plotsquared.bukkit.generator.BukkitPlotGenerator; | ||||
| import com.plotsquared.bukkit.inject.BackupModule; | ||||
| import com.plotsquared.bukkit.inject.BukkitModule; | ||||
| @@ -44,6 +45,7 @@ import com.plotsquared.bukkit.listener.SpigotListener; | ||||
| import com.plotsquared.bukkit.listener.WorldEvents; | ||||
| import com.plotsquared.bukkit.placeholder.PAPIPlaceholders; | ||||
| import com.plotsquared.bukkit.placeholder.PlaceholderFormatter; | ||||
| import com.plotsquared.bukkit.player.BukkitPlayer; | ||||
| import com.plotsquared.bukkit.player.BukkitPlayerManager; | ||||
| import com.plotsquared.bukkit.util.BukkitUtil; | ||||
| import com.plotsquared.bukkit.util.BukkitWorld; | ||||
| @@ -1269,13 +1271,15 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull PlatformWorldManager<?> worldManager() { | ||||
|         return this.worldManager; | ||||
|         return injector().getInstance(Key.get(new TypeLiteral<PlatformWorldManager<World>>() { | ||||
|         })); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     @NonNull | ||||
|     @SuppressWarnings("unchecked") | ||||
|     public PlayerManager<? extends PlotPlayer<Player>, ? extends Player> playerManager() { | ||||
|         return this.playerManager; | ||||
|         return (PlayerManager<BukkitPlayer, Player>) injector().getInstance(PlayerManager.class); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|   | ||||
| @@ -95,8 +95,7 @@ public class SingleWorldListener implements Listener { | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.LOWEST) | ||||
|     public void onChunkLoad(ChunkLoadEvent event) { | ||||
|         // disable this for now, should address https://github.com/IntellectualSites/PlotSquared/issues/4413 | ||||
|         // handle(event); | ||||
|         handle(event); | ||||
|     } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -106,10 +106,6 @@ public class PlotListener { | ||||
|                             iterator.remove(); | ||||
|                             continue; | ||||
|                         } | ||||
|                         // Don't attempt to heal dead players - they will get stuck in the abyss (#4406) | ||||
|                         if (PlotSquared.platform().worldUtil().getHealth(player) <= 0) { | ||||
|                             continue; | ||||
|                         } | ||||
|                         double level = PlotSquared.platform().worldUtil().getHealth(player); | ||||
|                         if (level != value.max) { | ||||
|                             PlotSquared.platform().worldUtil().setHealth(player, Math.min(level + value.amount, value.max)); | ||||
|   | ||||
| @@ -22,7 +22,7 @@ plugins { | ||||
| } | ||||
|  | ||||
| group = "com.intellectualsites.plotsquared" | ||||
| version = "7.3.9-SNAPSHOT" | ||||
| version = "7.3.8-SNAPSHOT" | ||||
|  | ||||
| if (!File("$rootDir/.git").exists()) { | ||||
|     logger.lifecycle(""" | ||||
| @@ -118,7 +118,7 @@ subprojects { | ||||
|     } | ||||
|  | ||||
|     signing { | ||||
|         if (!project.hasProperty("skip.signing") && !version.toString().endsWith("-SNAPSHOT")) { | ||||
|         if (!version.toString().endsWith("-SNAPSHOT")) { | ||||
|             val signingKey: String? by project | ||||
|             val signingPassword: String? by project | ||||
|             useInMemoryPgpKeys(signingKey, signingPassword) | ||||
|   | ||||
| @@ -3,7 +3,7 @@ | ||||
| paper = "1.20.2-R0.1-SNAPSHOT" | ||||
| guice = "7.0.0" | ||||
| spotbugs = "4.8.4" | ||||
| checkerqual = "3.43.0" | ||||
| checkerqual = "3.42.0" | ||||
| gson = "2.10" | ||||
| guava = "31.1-jre" | ||||
| snakeyaml = "2.0" | ||||
| @@ -23,21 +23,21 @@ mvdwapi = "3.1.1" | ||||
| prtree = "2.0.1" | ||||
| aopalliance = "1.0" | ||||
| cloud-services = "1.8.4" | ||||
| arkitektonika = "2.1.3" | ||||
| arkitektonika = "2.1.2" | ||||
| squirrelid = "0.3.2" | ||||
| paster = "1.1.6" | ||||
| paster = "1.1.5" | ||||
| bstats = "3.0.2" | ||||
| paperlib = "1.0.8" | ||||
| informative-annotations = "1.5" | ||||
| informative-annotations = "1.4" | ||||
| vault = "1.7.1" | ||||
| serverlib = "2.3.6" | ||||
| serverlib = "2.3.4" | ||||
|  | ||||
| # Gradle plugins | ||||
| shadow = "8.1.1" | ||||
| grgit = "4.1.1" | ||||
| spotless = "6.25.0" | ||||
| nexus = "2.0.0" | ||||
| runPaper = "2.3.0" | ||||
| runPaper = "2.2.3" | ||||
|  | ||||
| [libraries] | ||||
| # Platform expectations | ||||
|   | ||||
		Reference in New Issue
	
	Block a user