mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 17:43:44 +01:00 
			
		
		
		
	Compare commits
	
		
			3 Commits
		
	
	
		
			fix/v6/exc
			...
			shadow-deb
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 626b5fc866 | ||
|   | f0b4d9b103 | ||
|   | 2c8331e82e | 
							
								
								
									
										54
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										54
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -3,12 +3,12 @@ name: build | ||||
| on: | ||||
|   push: | ||||
|     branches: | ||||
|       - v6 | ||||
|       - shadow-debug | ||||
|  | ||||
| jobs: | ||||
|   build: | ||||
|     if: github.repository_owner == 'IntellectualSites' | ||||
|     runs-on: ubuntu-latest | ||||
|     runs-on: macos-latest | ||||
|     steps: | ||||
|       - name: Checkout Repository | ||||
|         uses: actions/checkout@v3 | ||||
| @@ -19,51 +19,5 @@ jobs: | ||||
|         with: | ||||
|           distribution: temurin | ||||
|           java-version: 17 | ||||
|       - name: Clean Build | ||||
|         run: ./gradlew clean build | ||||
|       - name: Determine release status | ||||
|         if: ${{ runner.os == 'Linux' }} | ||||
|         run: | | ||||
|           if [ "$(./gradlew properties | awk '/^version:/ { print $2; }' | grep '\-SNAPSHOT')" ]; then | ||||
|             echo "STATUS=snapshot" >> $GITHUB_ENV | ||||
|           else | ||||
|             echo "STATUS=release" >> $GITHUB_ENV | ||||
|           fi | ||||
|       - name: Publish Release | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} | ||||
|         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository | ||||
|         env: | ||||
|           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} | ||||
|           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} | ||||
|           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }} | ||||
|           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }} | ||||
|       - name: Publish Snapshot | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6' }} | ||||
|         run: ./gradlew publishToSonatype | ||||
|         env: | ||||
|           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }} | ||||
|           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }} | ||||
|       - name: Publish core javadoc | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} | ||||
|         uses: cpina/github-action-push-to-another-repository@main | ||||
|         env: | ||||
|           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} | ||||
|         with: | ||||
|           source-directory: 'Core/build/docs/javadoc' | ||||
|           destination-github-username: 'IntellectualSites' | ||||
|           destination-repository-name: 'plotsquared-javadocs' | ||||
|           user-email: ${{ secrets.USER_EMAIL }} | ||||
|           target-branch: main | ||||
|           target-directory: core | ||||
|       - name: Publish bukkit javadoc | ||||
|         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/v6'}} | ||||
|         uses: cpina/github-action-push-to-another-repository@main | ||||
|         env: | ||||
|           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }} | ||||
|         with: | ||||
|           source-directory: 'Bukkit/build/docs/javadoc' | ||||
|           destination-github-username: 'IntellectualSites' | ||||
|           destination-repository-name: 'plotsquared-javadocs' | ||||
|           user-email: ${{ secrets.USER_EMAIL }} | ||||
|           target-branch: main | ||||
|           target-directory: bukkit | ||||
|       - name: Build on macos-latest | ||||
|         run: ./gradlew clean build --warning-mode all | ||||
|   | ||||
| @@ -144,7 +144,7 @@ public class ClassicPlotManager extends SquarePlotManager { | ||||
|                     plot.getRegions(), | ||||
|                     blocks, | ||||
|                     classicPlotWorld.getMinBuildHeight(), | ||||
|                     classicPlotWorld.getMaxBuildHeight() - 1, | ||||
|                     classicPlotWorld.getMaxBuildHeight(), | ||||
|                     actor, | ||||
|                     queue | ||||
|             ); | ||||
| @@ -175,7 +175,7 @@ public class ClassicPlotManager extends SquarePlotManager { | ||||
|                             plot.getRegions(), | ||||
|                             blocks, | ||||
|                             classicPlotWorld.PLOT_HEIGHT + 1, | ||||
|                             classicPlotWorld.getMaxBuildHeight() - 1, | ||||
|                             classicPlotWorld.getMaxBuildHeight(), | ||||
|                             actor, | ||||
|                             queue | ||||
|                     ); | ||||
| @@ -281,7 +281,7 @@ public class ClassicPlotManager extends SquarePlotManager { | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         int maxY = classicPlotWorld.getMaxBuildHeight() - 1; | ||||
|         int maxY = classicPlotWorld.getMaxBuildHeight(); | ||||
|         if (!plot.isMerged(Direction.NORTH)) { | ||||
|             int z = bottom.getZ(); | ||||
|             for (int x = bottom.getX(); x <= top.getX(); x++) { | ||||
|   | ||||
| @@ -2506,7 +2506,7 @@ public class Plot { | ||||
|                 } | ||||
|             } | ||||
|             int minHeight = getArea().getMinBuildHeight(); | ||||
|             int maxHeight = getArea().getMaxBuildHeight() - 1; | ||||
|             int maxHeight = getArea().getMaxBuildHeight(); | ||||
|             Location gtopabs = this.area.getPlotAbs(top).getTopAbs(); | ||||
|             Location gbotabs = this.area.getPlotAbs(bot).getBottomAbs(); | ||||
|             visited.addAll(Lists.newArrayList((Iterable<? extends PlotId>) PlotId.PlotRangeIterator.range(bot, top))); | ||||
|   | ||||
| @@ -106,7 +106,7 @@ public class WEManager { | ||||
|                             .getTrusted().contains(uuid))) && !plot.getFlag(NoWorldeditFlag.class)) { | ||||
|                 for (CuboidRegion region : plot.getRegions()) { | ||||
|                     BlockVector3 pos1 = region.getMinimumPoint().withY(area.getMinBuildHeight()); | ||||
|                     BlockVector3 pos2 = region.getMaximumPoint().withY(area.getMaxBuildHeight() - 1); | ||||
|                     BlockVector3 pos2 = region.getMaximumPoint().withY(area.getMaxBuildHeight()); | ||||
|                     CuboidRegion copy = new CuboidRegion(pos1, pos2); | ||||
|                     regions.add(copy); | ||||
|                 } | ||||
|   | ||||
| @@ -20,16 +20,6 @@ plugins { | ||||
| group = "com.plotsquared" | ||||
| version = "6.10.9-SNAPSHOT" | ||||
|  | ||||
| if (!File("$rootDir/.git").exists()) { | ||||
|     logger.lifecycle(""" | ||||
|     ************************************************************************************** | ||||
|     You need to fork and clone this repository! Don't download a .zip file. | ||||
|     If you need assistance, consult the GitHub docs: https://docs.github.com/get-started/quickstart/fork-a-repo | ||||
|     ************************************************************************************** | ||||
|     """.trimIndent() | ||||
|     ).also { kotlin.system.exitProcess(1) } | ||||
| } | ||||
|  | ||||
| subprojects { | ||||
|     group = rootProject.group | ||||
|     version = rootProject.version | ||||
|   | ||||
		Reference in New Issue
	
	Block a user