mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-25 07:33:44 +02:00 
			
		
		
		
	Compare commits
	
		
			20 Commits
		
	
	
		
			6.8.0
			...
			refactor/v
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 79121603ee | ||
|   | bbb9965526 | ||
|   | bf646be482 | ||
|   | cc7e17960b | ||
|   | 3c75b170f0 | ||
|   | a79c474957 | ||
|   | 4bb480a238 | ||
|   | 9ffa935c0c | ||
|   | 0a32268784 | ||
|   | ae3b8c06f6 | ||
|   | 713c4ad0d2 | ||
|   | 48386c0828 | ||
|   | 625b3921e1 | ||
|   | 48aa37d173 | ||
|   | 2c2314e95c | ||
|   | 5eb2fc3ad0 | ||
| ![renovate[bot]](/assets/img/avatar_default.png)  | 82cd9a092c | ||
|   | 62754362c2 | ||
|   | 2e9dfd6f6f | ||
|   | fc9fe1462f | 
							
								
								
									
										4
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/ISSUE_TEMPLATE/bug_report.yml
									
									
									
									
										vendored
									
									
								
							| @@ -27,14 +27,12 @@ body: | ||||
|       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first. | ||||
|       multiple: false | ||||
|       options: | ||||
|         - '1.19' | ||||
|         - '1.18.2' | ||||
|         - '1.18.1' | ||||
|         - '1.18' | ||||
|         - '1.17.1' | ||||
|         - '1.16.5' | ||||
|         - '1.15.2' | ||||
|         - '1.14.4' | ||||
|         - '1.13.2' | ||||
|     validations: | ||||
|       required: true | ||||
|  | ||||
|   | ||||
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -131,6 +131,8 @@ local.properties | ||||
| checkstyle.xml | ||||
| classes/ | ||||
| *.bat | ||||
|  | ||||
| # Other | ||||
| docs/ | ||||
| build/ | ||||
|  | ||||
|   | ||||
							
								
								
									
										47
									
								
								.idea/icon.svg
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										47
									
								
								.idea/icon.svg
									
									
									
										generated
									
									
									
								
							| @@ -1,5 +1,5 @@ | ||||
| <?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||||
| <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 4000 3333.3333" height="3333.3333" width="4000" xml:space="preserve" id="svg2" version="1.1"> | ||||
| <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" id="svg2" xml:space="preserve" width="4000" height="3333.3333" viewBox="0 0 4000 3333.3333" sodipodi:docname="PlotSquared.ai"> | ||||
| 		<metadata id="metadata8"> | ||||
| 			<rdf:RDF> | ||||
| 				<cc:Work rdf:about=""> | ||||
| @@ -9,39 +9,40 @@ | ||||
| 			</rdf:RDF> | ||||
| 		</metadata> | ||||
|     <defs id="defs6"> | ||||
| 			<clipPath id="clipPath18" clipPathUnits="userSpaceOnUse"> | ||||
| 				<path id="path16" d="M 0,2500 H 3000 V 0 H 0 Z" /> | ||||
| 			<clipPath clipPathUnits="userSpaceOnUse" id="clipPath18"> | ||||
| 				<path d="M 0,2500 H 3000 V 0 H 0 Z" id="path16" /> | ||||
| 			</clipPath> | ||||
| 		</defs> | ||||
|     <g transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)" id="g10"> | ||||
|     <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="640" inkscape:window-height="480" id="namedview4" /> | ||||
|     <g id="g10" inkscape:groupmode="layer" inkscape:label="PlotSquared" transform="matrix(1.3333333,0,0,-1.3333333,0,3333.3333)"> | ||||
| 			<g id="g12"> | ||||
| 				<g clip-path="url(#clipPath18)" id="g14"> | ||||
| 					<g transform="translate(1486.1511,2242.6453)" id="g20"> | ||||
| 						<path id="path22" style="fill:#2b3f56;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0" /> | ||||
| 				<g id="g14" clip-path="url(#clipPath18)"> | ||||
| 					<g id="g20" transform="translate(1486.1511,2242.6453)"> | ||||
| 						<path d="m 0,0 c 16.533,10.846 33.211,21.453 50.104,31.699 78.972,-48.281 153.985,-102.704 227.269,-159.144 148.61,-115.422 287.884,-243.01 414.393,-382.333 111.39,-122.861 212.751,-255.152 298.898,-396.971 52.744,-87.322 100.544,-177.884 139.514,-272.214 -11.638,-3.551 -23.108,-7.655 -34.362,-12.286 l -0.24,0.288 c -11.135,12.982 -24.141,24.212 -34.915,37.506 -22.557,23.013 -45.425,45.737 -68.03,68.678 -19.725,20.253 -40.601,39.45 -58.958,60.974 -36.355,36.451 -72.517,73.093 -108.944,109.471 -22.628,26.013 -48.064,49.385 -71.965,74.197 -19.029,19.485 -38.706,38.346 -57.519,57.999 -12.166,14.998 -26.684,27.716 -39.93,41.658 -27.668,27.524 -54.903,55.479 -82.571,82.979 -23.924,27.956 -51.664,52.264 -76.692,79.164 -4.68,4.487 -8.855,10.774 -15.886,11.326 -22.34,34.027 -58.311,57.327 -97.377,67.502 -104.312,99.153 -215.487,191.202 -332.661,274.782 -117.942,-83.94 -229.476,-176.781 -334.484,-276.39 -26.684,-0.024 -53.368,0.024 -80.076,-0.024 0.024,-26.564 0.048,-53.104 0,-79.668 -72.229,-73.021 -139.491,-150.937 -202.385,-232.092 -63.758,-82.619 -121.973,-169.51 -173.541,-260.264 131.932,-69.061 257.864,-149.521 375.926,-240.275 0.096,-26.444 -0.12,-52.888 0.096,-79.332 l 0.744,-0.984 c 20.109,-24.14 43.409,-45.233 65.126,-67.861 15.118,-15.382 30.571,-30.404 45.569,-45.881 17.565,-20.733 37.698,-39.042 56.607,-58.503 19.917,-20.781 41.25,-40.218 59.967,-62.151 29.156,-29.299 58.167,-58.815 87.515,-87.922 29.155,-33.043 61.502,-63.111 92.169,-94.738 13.726,-12.67 25.124,-27.571 38.634,-40.457 25.029,-25.365 50.129,-50.657 75.325,-75.853 -37.914,-51.208 -73.741,-103.952 -107.192,-158.183 -167.83,273.317 -397.235,507.305 -662.37,687.158 -81.875,55.335 -167.23,105.584 -255.681,149.641 -52.815,26.276 -106.831,50.248 -162.239,70.381 99.393,233.628 242.795,446.715 410.289,636.79 93.562,106.088 194.634,205.433 301.466,298.13 C -217.335,-155.808 -111.439,-73.789 0,0" style="fill:#062f4c;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path22" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1201.7948,1741.5303)" id="g24"> | ||||
| 						<path id="path26" style="fill:#5693ce;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z" /> | ||||
|                     <g id="g24" transform="translate(1201.7948,1741.5303)"> | ||||
| 						<path d="M 0,0 C 105.008,99.609 216.543,192.45 334.485,276.39 451.659,192.81 562.833,100.76 667.146,1.608 c -34.987,8.83 -71.51,9.718 -107.264,6.431 -41.202,-4.296 -82.907,-19.077 -112.543,-48.953 -33.019,-32.155 -49.456,-77.604 -55.311,-122.501 -28.124,27.908 -56.104,55.983 -84.035,84.083 -2.976,2.976 -6.839,4.823 -10.391,6.911 -19.029,26.348 -45.953,46.673 -76.62,57.495 C 187.555,-2.472 151.513,-0.12 116.166,0 Z" style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path26" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(919.3342,1429.7462)" id="g28"> | ||||
| 						<path id="path30" style="fill:#5693ce;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0" /> | ||||
|                     <g id="g28" transform="translate(919.3342,1429.7462)"> | ||||
| 						<path d="m 0,0 c 62.894,81.156 130.156,159.072 202.385,232.092 0.048,-244.21 0.024,-488.421 0,-732.631 C 84.323,-409.785 -41.61,-329.325 -173.541,-260.264 -121.973,-169.51 -63.758,-82.619 0,0" style="fill:#4c8fcc;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path30" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1649.134,1700.6166)" id="g32"> | ||||
| 						<path id="path34" style="fill:#feeeef;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0" /> | ||||
|                     <g id="g32" transform="translate(1649.134,1700.6166)"> | ||||
| 						<path d="m 0,0 c 29.635,29.875 71.341,44.657 112.543,48.952 35.754,3.288 72.277,2.4 107.263,-6.431 39.066,-10.174 75.037,-33.474 97.377,-67.501 11.879,-17.661 20.181,-37.411 26.42,-57.687 10.871,-38.802 11.95,-79.356 11.446,-119.358 -44.345,-0.072 -88.69,0.048 -133.035,-0.072 -1.032,30.907 3.263,63.686 -10.175,92.626 -9.526,20.325 -32.107,31.243 -53.751,32.131 -21.453,1.44 -45.065,-4.32 -59.175,-21.597 -12.79,-15.861 -15.382,-37.002 -16.558,-56.655 -1.295,-29.132 3.696,-59.031 17.518,-84.923 16.821,-30.619 39.378,-57.783 64.526,-81.9 31.387,-32.634 67.501,-60.374 97.857,-94.041 27.332,-28.988 51.256,-61.479 68.005,-97.785 20.541,-41.13 26.972,-87.827 25.82,-133.372 -0.912,-32.107 -5.231,-64.406 -16.149,-94.737 -11.59,-31.699 -31.123,-61.047 -58.335,-81.371 -25.124,-19.125 -55.696,-29.852 -86.651,-34.771 -49.552,-6.743 -101.888,-4.847 -148.465,14.854 -35.227,14.829 -64.238,42.689 -81.708,76.548 -20.996,40.242 -27.115,86.339 -27.259,131.212 0.048,17.829 0,35.658 0.048,53.463 44.345,0.048 88.69,-0.023 133.059,0.048 1.728,-35.538 -4.055,-72.06 5.663,-106.807 5.783,-22.173 26.204,-37.794 48.185,-41.754 20.733,-3.431 43.577,-2.015 61.622,9.791 15.502,9.43 23.949,26.78 26.78,44.225 5.903,35.922 1.872,74.293 -15.381,106.688 -16.918,30.595 -39.474,57.711 -64.55,81.899 -33.187,34.099 -71.173,63.254 -102.585,99.081 -26.756,28.867 -49.408,61.646 -65.486,97.641 -24.572,52.48 -26.731,112.422 -20.18,169.102 C -49.456,-77.604 -33.019,-32.155 0,0" style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path34" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1262.7214,1613.126)" id="g36"> | ||||
| 						<path id="path38" style="fill:#feeeef;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667" /> | ||||
|                     <g id="g36" transform="translate(1262.7214,1613.126)"> | ||||
| 						<path d="m 0,0 v -301.13 c 23.204,0.024 46.409,-0.048 69.613,0.024 18.525,0.288 38.202,6.575 50.153,21.429 12.43,17.277 13.917,39.522 14.613,60.111 0.024,43.985 -0.048,87.994 0.024,131.979 -0.48,23.637 -0.983,50.369 -17.277,69.23 C 104.864,-5.711 86.867,-0.24 69.589,0 46.385,0.048 23.204,0.024 0,0 m -141.002,128.38 c 26.708,0.048 53.392,0 80.075,0.024 H 55.24 c 35.346,-0.12 71.389,-2.471 104.815,-14.925 30.668,-10.823 57.592,-31.148 76.621,-57.496 26.852,-39.09 36.69,-87.202 38.058,-133.947 0.024,-48.833 0.096,-97.689 -0.024,-146.521 -1.728,-47.993 -11.974,-97.953 -41.514,-136.971 -22.748,-30.644 -57.495,-50.801 -94.281,-59.583 -45.377,-11.878 -92.578,-6.791 -138.891,-7.847 -0.072,-111.799 0,-223.574 -0.024,-335.373 -13.942,0 -27.86,0.024 -41.778,-0.024 -32.802,0.072 -65.605,0 -98.384,0.048 l -0.744,0.984 c -0.216,26.444 0,52.888 -0.096,79.332 0.024,244.211 0.048,488.421 0,732.632 0.048,26.563 0.024,53.103 0,79.667" style="fill:#feeeee;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path38" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1966.3174,1675.6364)" id="g40"> | ||||
| 						<path id="path42" style="fill:#2a3746;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0" /> | ||||
|                     <g id="g40" transform="translate(1966.3174,1675.6364)"> | ||||
| 						<path d="m 0,0 c 7.031,-0.552 11.206,-6.839 15.885,-11.326 25.029,-26.9 52.768,-51.208 76.693,-79.164 27.667,-27.5 54.903,-55.456 82.571,-82.979 13.246,-13.942 27.764,-26.66 39.93,-41.658 18.813,-19.653 38.49,-38.514 57.519,-57.999 23.9,-24.812 49.337,-48.185 71.965,-74.197 36.427,-36.378 72.589,-73.02 108.943,-109.471 18.358,-21.524 39.234,-40.722 58.959,-60.974 22.605,-22.941 45.473,-45.665 68.03,-68.678 10.774,-13.294 23.78,-24.524 34.914,-37.506 -103.904,-41.97 -203.488,-94.114 -298.922,-152.761 -246.994,-152.28 -466.224,-350.298 -639.333,-583.398 -25.197,25.196 -50.297,50.488 -75.325,75.852 -13.51,12.886 -24.908,27.788 -38.634,40.458 -30.667,31.627 -63.014,61.695 -92.17,94.738 -29.347,29.107 -58.359,58.623 -87.514,87.922 -18.717,21.933 -40.05,41.37 -59.967,62.151 -18.909,19.461 -39.042,37.77 -56.607,58.503 -14.998,15.477 -30.452,30.499 -45.569,45.88 -21.717,22.629 -45.017,43.722 -65.126,67.862 32.779,-0.048 65.582,0.024 98.384,-0.048 114.391,-98.097 220.407,-205.984 315.384,-322.99 92.914,114.318 196.242,220.022 307.753,316.271 30.955,4.919 61.526,15.646 86.65,34.771 27.212,20.325 46.745,49.672 58.335,81.371 107.312,77.988 219.327,149.929 337.509,210.376 -35.299,64.67 -75.829,126.437 -118.254,186.643 C 176.253,-228.037 104.24,-140.115 26.42,-57.687 20.181,-37.41 11.878,-17.661 0,0" style="fill:#042338;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path42" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1499.3971,1669.1094)" id="g44"> | ||||
| 						<path id="path46" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0" /> | ||||
|                     <g id="g44" transform="translate(1499.3971,1669.1094)"> | ||||
| 						<path d="m 0,0 c 3.551,-2.088 7.415,-3.935 10.39,-6.911 27.932,-28.1 55.912,-56.175 84.036,-84.083 -6.551,-56.679 -4.392,-116.622 20.18,-169.102 16.078,-35.994 38.73,-68.774 65.486,-97.641 31.412,-35.826 69.398,-64.982 102.585,-99.081 25.076,-24.188 47.632,-51.304 64.55,-81.899 17.253,-32.395 21.284,-70.765 15.381,-106.688 -2.831,-17.445 -11.278,-34.794 -26.78,-44.225 -18.045,-11.806 -40.889,-13.222 -61.622,-9.79 -21.981,3.959 -42.402,19.58 -48.185,41.753 -9.718,34.747 -3.935,71.269 -5.663,106.808 -44.369,-0.072 -88.714,0 -133.059,-0.048 -0.048,-17.806 0,-35.635 -0.048,-53.464 0.144,-44.873 6.263,-90.97 27.259,-131.212 17.47,-33.859 46.481,-61.718 81.708,-76.548 46.577,-19.701 98.913,-21.597 148.465,-14.854 -111.511,-96.249 -214.839,-201.953 -307.753,-316.271 -94.977,117.006 -200.993,224.893 -315.383,322.99 13.918,0.048 27.836,0.024 41.777,0.024 0.024,111.799 -0.048,223.574 0.024,335.372 46.313,1.056 93.514,-4.031 138.891,7.847 36.786,8.783 71.533,28.94 94.282,59.583 29.539,39.018 39.785,88.978 41.513,136.971 0.12,48.833 0.048,97.689 0.024,146.522 C 36.69,-87.203 26.852,-39.09 0,0" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path46" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1748.0469,1601.6797)" id="g48"> | ||||
| 						<path id="path50" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0" /> | ||||
|                     <g id="g48" transform="translate(1748.0469,1601.6797)"> | ||||
| 						<path d="M 0,0 C 14.11,17.277 37.722,23.036 59.175,21.597 80.82,20.709 103.4,9.791 112.927,-10.534 c 13.438,-28.94 9.142,-61.719 10.174,-92.626 44.345,0.12 88.691,0 133.036,0.072 0.504,40.002 -0.576,80.556 -11.447,119.358 77.82,-82.428 149.833,-170.35 215.583,-262.664 42.426,-60.207 82.956,-121.973 118.254,-186.643 -118.182,-60.447 -230.196,-132.388 -337.508,-210.376 10.918,30.331 15.238,62.63 16.149,94.737 1.152,45.545 -5.279,92.242 -25.82,133.372 -16.749,36.306 -40.673,68.797 -68.005,97.785 -30.355,33.667 -66.47,61.406 -97.857,94.041 -25.148,24.117 -47.705,51.28 -64.526,81.9 -13.822,25.892 -18.813,55.791 -17.517,84.923 C -15.382,-37.002 -12.79,-15.862 0,0" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path50" /> | ||||
| 					</g> | ||||
|                     <g transform="translate(1262.7214,1613.126)" id="g52"> | ||||
| 						<path id="path54" style="fill:#3378bc;fill-opacity:1;fill-rule:nonzero;stroke:none" d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z" /> | ||||
|                     <g id="g52" transform="translate(1262.7214,1613.126)"> | ||||
| 						<path d="m 0,0 c 23.204,0.024 46.385,0.048 69.589,0 17.278,-0.24 35.275,-5.711 47.537,-18.357 16.294,-18.861 16.797,-45.593 17.277,-69.23 -0.072,-43.985 0,-87.994 -0.024,-131.979 -0.696,-20.589 -2.183,-42.834 -14.613,-60.111 -11.951,-14.854 -31.628,-21.141 -50.153,-21.429 -23.204,-0.072 -46.409,0 -69.613,-0.024 z" style="fill:#1c72ba;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path54" /> | ||||
| 					</g> | ||||
| 				</g> | ||||
| 			</g> | ||||
|   | ||||
| Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 11 KiB | 
| @@ -8,7 +8,7 @@ repositories { | ||||
|  | ||||
|     maven { | ||||
|         name = "PaperMC" | ||||
|         url = uri("https://papermc.io/repo/repository/maven-public/") | ||||
|         url = uri("https://repo.papermc.io/repository/maven-public/") | ||||
|     } | ||||
|  | ||||
|     maven { | ||||
| @@ -21,20 +21,20 @@ dependencies { | ||||
|     api(projects.plotSquaredCore) | ||||
|  | ||||
|     // Metrics | ||||
|     implementation(libs.bstats) | ||||
|     implementation("org.bstats:bstats-bukkit") | ||||
|  | ||||
|     // Paper | ||||
|     compileOnly(libs.paper) | ||||
|     implementation(libs.paperlib) | ||||
|     implementation("io.papermc:paperlib") | ||||
|  | ||||
|     // Plugins | ||||
|     compileOnly(libs.worldeditBukkit) { | ||||
|         exclude(group = "org.bukkit") | ||||
|         exclude(group = "org.spigotmc") | ||||
|     } | ||||
|     compileOnly(libs.fastasyncworldeditBukkit) { isTransitive = false } | ||||
|     testImplementation(libs.fastasyncworldeditBukkit) { isTransitive = false } | ||||
|     compileOnly(libs.vault) { | ||||
|     compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false } | ||||
|     testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false } | ||||
|     compileOnly("com.github.MilkBowl:VaultAPI") { | ||||
|         exclude(group = "org.bukkit") | ||||
|     } | ||||
|     compileOnly(libs.placeholderapi) | ||||
| @@ -44,15 +44,15 @@ dependencies { | ||||
|  | ||||
|     // Other libraries | ||||
|     implementation(libs.squirrelid) { isTransitive = false } | ||||
|     implementation(libs.serverlib) | ||||
|     implementation("dev.notmyfault.serverlib:ServerLib") | ||||
|  | ||||
|     // Our libraries | ||||
|     implementation(libs.arkitektonika) | ||||
|     implementation(libs.http4j) | ||||
|     implementation(libs.paster) | ||||
|     implementation("com.intellectualsites.paster:Paster") | ||||
|  | ||||
|     // Adventure | ||||
|     implementation(libs.adventurePlatformBukkit) | ||||
|     implementation("net.kyori:adventure-platform-bukkit") | ||||
| } | ||||
|  | ||||
| tasks.processResources { | ||||
| @@ -85,6 +85,8 @@ tasks.named<ShadowJar>("shadowJar") { | ||||
|     relocate("javax.annotation", "com.plotsquared.core.annotation") | ||||
|     relocate("com.github.spotbugs", "com.plotsquared.core.spotbugs") | ||||
|     relocate("javax.inject", "com.plotsquared.core.annotation.inject") | ||||
|     relocate("net.jcip", "com.plotsquared.core.annotations.jcip") | ||||
|     relocate("edu.umd.cs.findbugs", "com.plotsquared.core.annotations.findbugs") | ||||
|  | ||||
|     // Get rid of all the libs which are 100% unused. | ||||
|     minimize() | ||||
| @@ -95,7 +97,7 @@ tasks.named<ShadowJar>("shadowJar") { | ||||
| tasks { | ||||
|     withType<Javadoc> { | ||||
|         val opt = options as StandardJavadocDocletOptions | ||||
|         opt.links("https://papermc.io/javadocs/paper/1.18/") | ||||
|         opt.links("https://jd.papermc.io/paper/1.18/") | ||||
|         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString()) | ||||
|         opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/") | ||||
|         opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString()) | ||||
|   | ||||
| @@ -112,30 +112,7 @@ public class BukkitPlotGenerator extends ChunkGenerator | ||||
|     @Override | ||||
|     public @NonNull List<BlockPopulator> getDefaultPopulators(@NonNull World world) { | ||||
|         try { | ||||
|             if (!this.loaded) { | ||||
|                 String name = world.getName(); | ||||
|                 PlotSquared.get().loadWorld(name, this); | ||||
|                 final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(name); | ||||
|                 if (!areas.isEmpty()) { | ||||
|                     PlotArea area = areas.iterator().next(); | ||||
|                     if (!area.isMobSpawning()) { | ||||
|                         if (!area.isSpawnEggs()) { | ||||
|                             world.setSpawnFlags(false, false); | ||||
|                         } | ||||
|                         world.setAmbientSpawnLimit(0); | ||||
|                         world.setAnimalSpawnLimit(0); | ||||
|                         world.setMonsterSpawnLimit(0); | ||||
|                         world.setWaterAnimalSpawnLimit(0); | ||||
|                     } else { | ||||
|                         world.setSpawnFlags(true, true); | ||||
|                         world.setAmbientSpawnLimit(-1); | ||||
|                         world.setAnimalSpawnLimit(-1); | ||||
|                         world.setMonsterSpawnLimit(-1); | ||||
|                         world.setWaterAnimalSpawnLimit(-1); | ||||
|                     } | ||||
|                 } | ||||
|                 this.loaded = true; | ||||
|             } | ||||
|             checkLoaded(world); | ||||
|         } catch (Exception e) { | ||||
|             e.printStackTrace(); | ||||
|         } | ||||
| @@ -154,6 +131,39 @@ public class BukkitPlotGenerator extends ChunkGenerator | ||||
|         return toAdd; | ||||
|     } | ||||
|  | ||||
|     private synchronized void checkLoaded(@NonNull World world) { | ||||
|         // Do not attempt to load configurations until WorldEdit has a platform ready. | ||||
|         if (!PlotSquared.get().isWeInitialised()) { | ||||
|             return; | ||||
|         } | ||||
|         if (!this.loaded) { | ||||
|             String name = world.getName(); | ||||
|             PlotSquared.get().loadWorld(name, this); | ||||
|             final Set<PlotArea> areas = this.plotAreaManager.getPlotAreasSet(name); | ||||
|             if (!areas.isEmpty()) { | ||||
|                 PlotArea area = areas.iterator().next(); | ||||
|                 if (!area.isMobSpawning()) { | ||||
|                     if (!area.isSpawnEggs()) { | ||||
|                         world.setSpawnFlags(false, false); | ||||
|                     } | ||||
|                     setSpawnLimits(world, 0); | ||||
|                 } else { | ||||
|                     world.setSpawnFlags(true, true); | ||||
|                     setSpawnLimits(world, -1); | ||||
|                 } | ||||
|             } | ||||
|             this.loaded = true; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     @SuppressWarnings("deprecation") | ||||
|     private void setSpawnLimits(@NonNull World world, int limit) { | ||||
|         world.setAmbientSpawnLimit(limit); | ||||
|         world.setAnimalSpawnLimit(limit); | ||||
|         world.setMonsterSpawnLimit(limit); | ||||
|         world.setWaterAnimalSpawnLimit(limit); | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public @NonNull ChunkData generateChunkData( | ||||
|             @NonNull World world, @NonNull Random random, int x, int z, | ||||
| @@ -201,9 +211,7 @@ public class BukkitPlotGenerator extends ChunkGenerator | ||||
|     private void generate(BlockVector2 loc, World world, ScopedQueueCoordinator result) { | ||||
|         // Load if improperly loaded | ||||
|         if (!this.loaded) { | ||||
|             String name = world.getName(); | ||||
|             PlotSquared.get().loadWorld(name, this); | ||||
|             this.loaded = true; | ||||
|             checkLoaded(world); | ||||
|         } | ||||
|         // Process the chunk | ||||
|         if (ChunkManager.preProcessChunk(loc, result)) { | ||||
|   | ||||
| @@ -72,6 +72,7 @@ import net.kyori.adventure.text.minimessage.Template; | ||||
| import org.bukkit.Bukkit; | ||||
| import org.bukkit.GameMode; | ||||
| import org.bukkit.Material; | ||||
| import org.bukkit.Tag; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.block.BlockFace; | ||||
| import org.bukkit.block.BlockState; | ||||
| @@ -113,11 +114,20 @@ import org.checkerframework.checker.nullness.qual.NonNull; | ||||
| import java.util.Iterator; | ||||
| import java.util.List; | ||||
| import java.util.Objects; | ||||
| import java.util.Set; | ||||
| import java.util.UUID; | ||||
|  | ||||
| @SuppressWarnings("unused") | ||||
| public class BlockEventListener implements Listener { | ||||
|  | ||||
|     private static final Set<Material> PISTONS = Set.of( | ||||
|             Material.PISTON, | ||||
|             Material.STICKY_PISTON | ||||
|     ); | ||||
|     private static final Set<Material> PHYSICS_BLOCKS = Set.of( | ||||
|             Material.TURTLE_EGG, | ||||
|             Material.TURTLE_SPAWN_EGG | ||||
|     ); | ||||
|     private final PlotAreaManager plotAreaManager; | ||||
|     private final WorldEdit worldEdit; | ||||
|  | ||||
| @@ -223,50 +233,33 @@ public class BlockEventListener implements Listener { | ||||
|             plot.debug("Prevented block physics and resent block change because disable-physics = true"); | ||||
|             return; | ||||
|         } | ||||
|         switch (event.getChangedType()) { | ||||
|             case COMPARATOR: { | ||||
|         if (event.getChangedType() == Material.COMPARATOR) { | ||||
|             if (!plot.getFlag(RedstoneFlag.class)) { | ||||
|                 event.setCancelled(true); | ||||
|                 plot.debug("Prevented comparator update because redstone = false"); | ||||
|             } | ||||
|             return; | ||||
|         } | ||||
|             case ANVIL: | ||||
|             case DRAGON_EGG: | ||||
|             case GRAVEL: | ||||
|             case SAND: | ||||
|             case TURTLE_EGG: | ||||
|             case TURTLE_HELMET: | ||||
|             case TURTLE_SPAWN_EGG: { | ||||
|         if (PHYSICS_BLOCKS.contains(event.getChangedType())) { | ||||
|             if (plot.getFlag(DisablePhysicsFlag.class)) { | ||||
|                 event.setCancelled(true); | ||||
|                 plot.debug("Prevented block physics because disable-physics = true"); | ||||
|             } | ||||
|             return; | ||||
|         } | ||||
|             default: | ||||
|         if (Settings.Redstone.DETECT_INVALID_EDGE_PISTONS) { | ||||
|                     switch (block.getType()) { | ||||
|                         case PISTON, STICKY_PISTON -> { | ||||
|             if (PISTONS.contains(block.getType())) { | ||||
|                 org.bukkit.block.data.Directional piston = (org.bukkit.block.data.Directional) block.getBlockData(); | ||||
|                             switch (piston.getFacing()) { | ||||
|                                 case EAST -> location = location.add(1, 0, 0); | ||||
|                                 case SOUTH -> location = location.add(-1, 0, 0); | ||||
|                                 case WEST -> location = location.add(0, 0, 1); | ||||
|                                 case NORTH -> location = location.add(0, 0, -1); | ||||
|                             } | ||||
|                 final BlockFace facing = piston.getFacing(); | ||||
|                 location = location.add(facing.getModX(), facing.getModY(), facing.getModZ()); | ||||
|                 Plot newPlot = area.getOwnedPlotAbs(location); | ||||
|                 if (!plot.equals(newPlot)) { | ||||
|                     event.setCancelled(true); | ||||
|                     plot.debug("Prevented piston update because of invalid edge piston detection"); | ||||
|                                 return; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|                 break; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) | ||||
|     public void blockCreate(BlockPlaceEvent event) { | ||||
| @@ -551,17 +544,18 @@ public class BlockEventListener implements Listener { | ||||
|         if (plot == null) { | ||||
|             return; | ||||
|         } | ||||
|         switch (event.getNewState().getType()) { | ||||
|             case SNOW: | ||||
|             case SNOW_BLOCK: | ||||
|         if (location.getY() >= area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) { | ||||
|             event.setCancelled(true); | ||||
|             return; | ||||
|         } | ||||
|         if (Tag.SNOW.isTagged(event.getNewState().getType())) { | ||||
|             if (!plot.getFlag(SnowFormFlag.class)) { | ||||
|                 plot.debug("Snow could not form because snow-form = false"); | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|             return; | ||||
|             case ICE: | ||||
|             case FROSTED_ICE: | ||||
|             case PACKED_ICE: | ||||
|         } | ||||
|         if (Tag.ICE.isTagged(event.getNewState().getType())) { | ||||
|             if (!plot.getFlag(IceFormFlag.class)) { | ||||
|                 plot.debug("Ice could not form because ice-form = false"); | ||||
|                 event.setCancelled(true); | ||||
| @@ -586,18 +580,12 @@ public class BlockEventListener implements Listener { | ||||
|             return; | ||||
|         } | ||||
|         Class<? extends BooleanFlag<?>> flag; | ||||
|         switch (event.getNewState().getType()) { | ||||
|             case SNOW: | ||||
|             case SNOW_BLOCK: | ||||
|         if (Tag.SNOW.isTagged(event.getNewState().getType())) { | ||||
|             flag = SnowFormFlag.class; | ||||
|                 break; | ||||
|             case ICE: | ||||
|             case FROSTED_ICE: | ||||
|             case PACKED_ICE: | ||||
|         } else if (Tag.ICE.isTagged(event.getNewState().getType())) { | ||||
|             flag = IceFormFlag.class; | ||||
|                 break; | ||||
|             default: | ||||
|                 return; // other blocks are ignored by this event | ||||
|         } else { | ||||
|             return; | ||||
|         } | ||||
|         boolean allowed = plot.getFlag(flag); | ||||
|         Entity entity = event.getEntity(); | ||||
| @@ -701,111 +689,98 @@ public class BlockEventListener implements Listener { | ||||
|             event.setCancelled(true); | ||||
|             return; | ||||
|         } | ||||
|         switch (block.getType()) { | ||||
|             case ICE: | ||||
|         Material blockType = block.getType(); | ||||
|         if (Tag.ICE.isTagged(blockType)) { | ||||
|             if (!plot.getFlag(IceMeltFlag.class)) { | ||||
|                 plot.debug("Ice could not melt because ice-melt = false"); | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|                 break; | ||||
|             case SNOW: | ||||
|             return; | ||||
|         } | ||||
|         if (Tag.SNOW.isTagged(blockType)) { | ||||
|             if (!plot.getFlag(SnowMeltFlag.class)) { | ||||
|                 plot.debug("Snow could not melt because snow-melt = false"); | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|                 break; | ||||
|             case FARMLAND: | ||||
|             return; | ||||
|         } | ||||
|         if (blockType == Material.FARMLAND) { | ||||
|             if (!plot.getFlag(SoilDryFlag.class)) { | ||||
|                 plot.debug("Soil could not dry because soil-dry = false"); | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|                 break; | ||||
|             case TUBE_CORAL_BLOCK: | ||||
|             case BRAIN_CORAL_BLOCK: | ||||
|             case BUBBLE_CORAL_BLOCK: | ||||
|             case FIRE_CORAL_BLOCK: | ||||
|             case HORN_CORAL_BLOCK: | ||||
|             case TUBE_CORAL: | ||||
|             case BRAIN_CORAL: | ||||
|             case BUBBLE_CORAL: | ||||
|             case FIRE_CORAL: | ||||
|             case HORN_CORAL: | ||||
|             case TUBE_CORAL_FAN: | ||||
|             case BRAIN_CORAL_FAN: | ||||
|             case BUBBLE_CORAL_FAN: | ||||
|             case FIRE_CORAL_FAN: | ||||
|             case HORN_CORAL_FAN: | ||||
|             case BRAIN_CORAL_WALL_FAN: | ||||
|             case BUBBLE_CORAL_WALL_FAN: | ||||
|             case FIRE_CORAL_WALL_FAN: | ||||
|             case HORN_CORAL_WALL_FAN: | ||||
|             case TUBE_CORAL_WALL_FAN: | ||||
|             return; | ||||
|         } | ||||
|         if (Tag.CORAL_BLOCKS.isTagged(blockType) || Tag.CORALS.isTagged(blockType)) { | ||||
|             if (!plot.getFlag(CoralDryFlag.class)) { | ||||
|                 plot.debug("Coral could not dry because coral-dry = false"); | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|                 break; | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) | ||||
|     public void onChange(BlockFromToEvent event) { | ||||
|         Block from = event.getBlock(); | ||||
|         Block fromBlock = event.getBlock(); | ||||
|  | ||||
|         // Check liquid flow flag inside of origin plot too | ||||
|         final Location fLocation = BukkitUtil.adapt(from.getLocation()); | ||||
|         final PlotArea fromArea = fLocation.getPlotArea(); | ||||
|         final Location fromLocation = BukkitUtil.adapt(fromBlock.getLocation()); | ||||
|         final PlotArea fromArea = fromLocation.getPlotArea(); | ||||
|         if (fromArea != null) { | ||||
|             final Plot plot = fromArea.getOwnedPlot(fLocation); | ||||
|             if (plot != null && plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event | ||||
|             final Plot fromPlot = fromArea.getOwnedPlot(fromLocation); | ||||
|             if (fromPlot != null && fromPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event | ||||
|                     .getBlock() | ||||
|                     .isLiquid()) { | ||||
|                 plot.debug("Liquid could not flow because liquid-flow = disabled"); | ||||
|                 fromPlot.debug("Liquid could not flow because liquid-flow = disabled"); | ||||
|                 event.setCancelled(true); | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         Block to = event.getToBlock(); | ||||
|         Location tLocation = BukkitUtil.adapt(to.getLocation()); | ||||
|         PlotArea area = tLocation.getPlotArea(); | ||||
|         if (area == null) { | ||||
|             if (from.getType() == Material.DRAGON_EGG && fromArea != null) { | ||||
|         Block toBlock = event.getToBlock(); | ||||
|         Location toLocation = BukkitUtil.adapt(toBlock.getLocation()); | ||||
|         PlotArea toArea = toLocation.getPlotArea(); | ||||
|         if (toArea == null) { | ||||
|             if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|             return; | ||||
|         } | ||||
|         Plot plot = area.getOwnedPlot(tLocation); | ||||
|         if (toLocation.getY() >= toArea.getMaxBuildHeight() || toLocation.getY() < toArea.getMinBuildHeight()) { | ||||
|             event.setCancelled(true); | ||||
|             return; | ||||
|         } | ||||
|         Plot toPlot = toArea.getOwnedPlot(toLocation); | ||||
|  | ||||
|         if (from.getType() == Material.DRAGON_EGG && fromArea != null) { | ||||
|             final Plot fromPlot = fromArea.getOwnedPlot(fLocation); | ||||
|         if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) { | ||||
|             final Plot fromPlot = fromArea.getOwnedPlot(fromLocation); | ||||
|  | ||||
|             if (fromPlot != null || plot != null) { | ||||
|                 if ((fromPlot == null || !fromPlot.equals(plot)) && (plot == null || !plot.equals(fromPlot))) { | ||||
|             if (fromPlot != null || toPlot != null) { | ||||
|                 if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) { | ||||
|                     event.setCancelled(true); | ||||
|                     return; | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if (plot != null) { | ||||
|             if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(plot, area.getOwnedPlot(fLocation))) { | ||||
|         if (toPlot != null) { | ||||
|             if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(toPlot, toArea.getOwnedPlot(fromLocation))) { | ||||
|                 event.setCancelled(true); | ||||
|                 return; | ||||
|             } | ||||
|             if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.ENABLED && event.getBlock().isLiquid()) { | ||||
|             if (toPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.ENABLED && event.getBlock().isLiquid()) { | ||||
|                 return; | ||||
|             } | ||||
|             if (plot.getFlag(DisablePhysicsFlag.class)) { | ||||
|                 plot.debug(event.getBlock().getType() + " could not update because disable-physics = true"); | ||||
|             if (toPlot.getFlag(DisablePhysicsFlag.class)) { | ||||
|                 toPlot.debug(event.getBlock().getType() + " could not update because disable-physics = true"); | ||||
|                 event.setCancelled(true); | ||||
|                 return; | ||||
|             } | ||||
|             if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) { | ||||
|                 plot.debug("Liquid could not flow because liquid-flow = disabled"); | ||||
|             if (toPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) { | ||||
|                 toPlot.debug("Liquid could not flow because liquid-flow = disabled"); | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|         } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(null, area.getOwnedPlot(fLocation))) { | ||||
|         } else if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(null, toArea.getOwnedPlot(fromLocation))) { | ||||
|             event.setCancelled(true); | ||||
|         } else if (event.getBlock().isLiquid()) { | ||||
|             final org.bukkit.Location location = event.getBlock().getLocation(); | ||||
|   | ||||
| @@ -33,6 +33,7 @@ import com.plotsquared.core.plot.Plot; | ||||
| import com.plotsquared.core.plot.PlotArea; | ||||
| import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag; | ||||
| import org.bukkit.Material; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.entity.Entity; | ||||
| import org.bukkit.entity.Item; | ||||
| @@ -46,11 +47,31 @@ import org.bukkit.event.block.BlockReceiveGameEvent; | ||||
|  | ||||
| import java.util.List; | ||||
| import java.util.Objects; | ||||
| import java.util.Set; | ||||
| import java.util.UUID; | ||||
|  | ||||
| @SuppressWarnings("unused") | ||||
| public class BlockEventListener117 implements Listener { | ||||
|  | ||||
|     private static final Set<Material> COPPER_OXIDIZING = Set.of( | ||||
|             Material.COPPER_BLOCK, | ||||
|             Material.EXPOSED_COPPER, | ||||
|             Material.WEATHERED_COPPER, | ||||
|             Material.OXIDIZED_COPPER, | ||||
|             Material.CUT_COPPER, | ||||
|             Material.EXPOSED_CUT_COPPER, | ||||
|             Material.WEATHERED_CUT_COPPER, | ||||
|             Material.OXIDIZED_CUT_COPPER, | ||||
|             Material.CUT_COPPER_STAIRS, | ||||
|             Material.EXPOSED_CUT_COPPER_STAIRS, | ||||
|             Material.WEATHERED_CUT_COPPER_STAIRS, | ||||
|             Material.OXIDIZED_CUT_COPPER_STAIRS, | ||||
|             Material.CUT_COPPER_SLAB, | ||||
|             Material.EXPOSED_CUT_COPPER_SLAB, | ||||
|             Material.WEATHERED_CUT_COPPER_SLAB, | ||||
|             Material.OXIDIZED_CUT_COPPER_SLAB | ||||
|     ); | ||||
|  | ||||
|     @Inject | ||||
|     public BlockEventListener117() { | ||||
|     } | ||||
| @@ -155,23 +176,7 @@ public class BlockEventListener117 implements Listener { | ||||
|         if (plot == null) { | ||||
|             return; | ||||
|         } | ||||
|         switch (event.getNewState().getType()) { | ||||
|             case COPPER_BLOCK: | ||||
|             case EXPOSED_COPPER: | ||||
|             case WEATHERED_COPPER: | ||||
|             case OXIDIZED_COPPER: | ||||
|             case CUT_COPPER: | ||||
|             case EXPOSED_CUT_COPPER: | ||||
|             case WEATHERED_CUT_COPPER: | ||||
|             case OXIDIZED_CUT_COPPER: | ||||
|             case CUT_COPPER_STAIRS: | ||||
|             case EXPOSED_CUT_COPPER_STAIRS: | ||||
|             case WEATHERED_CUT_COPPER_STAIRS: | ||||
|             case OXIDIZED_CUT_COPPER_STAIRS: | ||||
|             case CUT_COPPER_SLAB: | ||||
|             case EXPOSED_CUT_COPPER_SLAB: | ||||
|             case WEATHERED_CUT_COPPER_SLAB: | ||||
|             case OXIDIZED_CUT_COPPER_SLAB: | ||||
|         if (COPPER_OXIDIZING.contains(event.getNewState().getType())) { | ||||
|             if (!plot.getFlag(CopperOxideFlag.class)) { | ||||
|                 plot.debug("Copper could not oxide because copper-oxide = false"); | ||||
|                 event.setCancelled(true); | ||||
|   | ||||
| @@ -208,7 +208,7 @@ public class EntityEventListener implements Listener { | ||||
|             } | ||||
|             return; | ||||
|         } | ||||
|         if (BukkitEntityUtil.checkEntity(entity, plot)) { | ||||
|         if (BukkitEntityUtil.checkEntity(entity, plot.getBasePlot(false))) { | ||||
|             event.setCancelled(true); | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -131,16 +131,16 @@ public class EntitySpawnListener implements Listener { | ||||
|             return; | ||||
|         } | ||||
|         Plot plot = location.getOwnedPlotAbs(); | ||||
|         if (plot == null) { | ||||
|         EntityType type = entity.getType(); | ||||
|         if (plot == null) { | ||||
|             if (!area.isMobSpawning()) { | ||||
|                 switch (type) { | ||||
|                     case DROPPED_ITEM: | ||||
|                         if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||
|                             event.setCancelled(true); | ||||
|                 if (type == EntityType.PLAYER) { | ||||
|                     return; | ||||
|                 } | ||||
|                     case PLAYER: | ||||
|                 if (type == EntityType.DROPPED_ITEM) { | ||||
|                     if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||
|                         event.setCancelled(true); | ||||
|                     } | ||||
|                     return; | ||||
|                 } | ||||
|                 if (type.isAlive()) { | ||||
| @@ -155,12 +155,13 @@ public class EntitySpawnListener implements Listener { | ||||
|         if (Settings.Done.RESTRICT_BUILDING && DoneFlag.isDone(plot)) { | ||||
|             event.setCancelled(true); | ||||
|         } | ||||
|         switch (entity.getType()) { | ||||
|             case ENDER_CRYSTAL: | ||||
|         if (type == EntityType.ENDER_CRYSTAL) { | ||||
|             if (BukkitEntityUtil.checkEntity(entity, plot)) { | ||||
|                 event.setCancelled(true); | ||||
|             } | ||||
|             case SHULKER: | ||||
|             return; | ||||
|         } | ||||
|         if (type == EntityType.SHULKER) { | ||||
|             if (!entity.hasMetadata("shulkerPlot")) { | ||||
|                 entity.setMetadata("shulkerPlot", new FixedMetadataValue((Plugin) PlotSquared.platform(), plot.getId())); | ||||
|             } | ||||
|   | ||||
| @@ -237,14 +237,14 @@ public class PaperListener implements Listener { | ||||
|         if (plot == null) { | ||||
|             EntityType type = event.getType(); | ||||
|             if (!area.isMobSpawning()) { | ||||
|                 switch (type) { | ||||
|                     case DROPPED_ITEM: | ||||
|                 if (type == EntityType.PLAYER) { | ||||
|                     return; | ||||
|                 } | ||||
|                 if (type == EntityType.DROPPED_ITEM) { | ||||
|                     if (Settings.Enabled_Components.KILL_ROAD_ITEMS) { | ||||
|                         event.setShouldAbortSpawn(true); | ||||
|                         event.setCancelled(true); | ||||
|                             return; | ||||
|                     } | ||||
|                     case PLAYER: | ||||
|                     return; | ||||
|                 } | ||||
|                 if (type.isAlive()) { | ||||
|   | ||||
| @@ -89,6 +89,7 @@ import org.bukkit.Bukkit; | ||||
| import org.bukkit.ChatColor; | ||||
| import org.bukkit.FluidCollisionMode; | ||||
| import org.bukkit.Material; | ||||
| import org.bukkit.Tag; | ||||
| import org.bukkit.block.Block; | ||||
| import org.bukkit.block.BlockFace; | ||||
| import org.bukkit.block.BlockState; | ||||
| @@ -166,6 +167,20 @@ import java.util.regex.Pattern; | ||||
| @SuppressWarnings("unused") | ||||
| public class PlayerEventListener extends PlotListener implements Listener { | ||||
|  | ||||
|     private static final Set<Material> MINECARTS = Set.of( | ||||
|             Material.MINECART, | ||||
|             Material.TNT_MINECART, | ||||
|             Material.CHEST_MINECART, | ||||
|             Material.COMMAND_BLOCK_MINECART, | ||||
|             Material.FURNACE_MINECART, | ||||
|             Material.HOPPER_MINECART | ||||
|     ); | ||||
|     private static final Set<Material> BOOKS = Set.of( | ||||
|             Material.BOOK, | ||||
|             Material.KNOWLEDGE_BOOK, | ||||
|             Material.WRITABLE_BOOK, | ||||
|             Material.WRITTEN_BOOK | ||||
|     ); | ||||
|     private final EventDispatcher eventDispatcher; | ||||
|     private final WorldEdit worldEdit; | ||||
|     private final PlotAreaManager plotAreaManager; | ||||
| @@ -837,10 +852,10 @@ public class PlayerEventListener extends PlotListener implements Listener { | ||||
|         if ((slot > 8) || !event.getEventName().equals("InventoryCreativeEvent")) { | ||||
|             return; | ||||
|         } | ||||
|         ItemStack current = inv.getItemInHand(); | ||||
|         ItemStack oldItem = inv.getItemInHand(); | ||||
|         ItemMeta oldMeta = oldItem.getItemMeta(); | ||||
|         ItemStack newItem = event.getCursor(); | ||||
|         ItemMeta newMeta = newItem.getItemMeta(); | ||||
|         ItemMeta oldMeta = newItem.getItemMeta(); | ||||
|  | ||||
|         if (event.getClick() == ClickType.CREATIVE) { | ||||
|             final Plot plot = pp.getCurrentPlot(); | ||||
| @@ -880,33 +895,25 @@ public class PlayerEventListener extends PlotListener implements Listener { | ||||
|                 oldLore = lore.toString(); | ||||
|             } | ||||
|         } | ||||
|         if (!"[(+NBT)]".equals(newLore) || (current.equals(newItem) && newLore.equals(oldLore))) { | ||||
|             switch (newItem.getType()) { | ||||
|                 case LEGACY_BANNER: | ||||
|                 case PLAYER_HEAD: | ||||
|                     if (newMeta != null) { | ||||
|                         break; | ||||
|                     } | ||||
|                 default: | ||||
|         Material itemType = newItem.getType(); | ||||
|         if (!"[(+NBT)]".equals(newLore) || (oldItem.equals(newItem) && newLore.equals(oldLore))) { | ||||
|             if (newMeta == null || (itemType != Material.LEGACY_BANNER && itemType != Material.PLAYER_HEAD)) { | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
|         Block block = player.getTargetBlock(null, 7); | ||||
|         org.bukkit.block.BlockState state = block.getState(); | ||||
|         Material stateType = state.getType(); | ||||
|         Material itemType = newItem.getType(); | ||||
|         if (stateType != itemType) { | ||||
|             switch (stateType) { | ||||
|                 case LEGACY_STANDING_BANNER: | ||||
|                 case LEGACY_WALL_BANNER: | ||||
|                     if (itemType == Material.LEGACY_BANNER) { | ||||
|                         break; | ||||
|             if (stateType == Material.LEGACY_WALL_BANNER || stateType == Material.LEGACY_STANDING_BANNER) { | ||||
|                 if (itemType != Material.LEGACY_BANNER) { | ||||
|                     return; | ||||
|                 } | ||||
|                 case LEGACY_SKULL: | ||||
|                     if (itemType == Material.LEGACY_SKULL_ITEM) { | ||||
|                         break; | ||||
|             } else if (stateType == Material.LEGACY_SKULL) { | ||||
|                 if (itemType != Material.LEGACY_SKULL_ITEM) { | ||||
|                     return; | ||||
|                 } | ||||
|                 default: | ||||
|             } else { | ||||
|                 return; | ||||
|             } | ||||
|         } | ||||
| @@ -946,7 +953,7 @@ public class PlayerEventListener extends PlotListener implements Listener { | ||||
|             } | ||||
|         } | ||||
|         if (cancelled) { | ||||
|             if ((current.getType() == newItem.getType()) && (current.getDurability() == newItem | ||||
|             if ((oldItem.getType() == newItem.getType()) && (oldItem.getDurability() == newItem | ||||
|                     .getDurability())) { | ||||
|                 event.setCursor( | ||||
|                         new ItemStack(newItem.getType(), newItem.getAmount(), newItem.getDurability())); | ||||
| @@ -1133,14 +1140,21 @@ public class PlayerEventListener extends PlotListener implements Listener { | ||||
|                     //Allow all players to eat while also allowing the block place event ot be fired | ||||
|                     return; | ||||
|                 } | ||||
|                 switch (type) { | ||||
|                     case ACACIA_BOAT, BIRCH_BOAT, CHEST_MINECART, COMMAND_BLOCK_MINECART, DARK_OAK_BOAT, FURNACE_MINECART, HOPPER_MINECART, JUNGLE_BOAT, MINECART, OAK_BOAT, SPRUCE_BOAT, TNT_MINECART -> eventType = PlayerBlockEventType.PLACE_VEHICLE; | ||||
|                     case FIREWORK_ROCKET, FIREWORK_STAR -> eventType = PlayerBlockEventType.SPAWN_MOB; | ||||
|                     case BOOK, KNOWLEDGE_BOOK, WRITABLE_BOOK, WRITTEN_BOOK -> eventType = PlayerBlockEventType.READ; | ||||
|                     case ARMOR_STAND -> { | ||||
|                 if (type == Material.ARMOR_STAND) { | ||||
|                     location = BukkitUtil.adapt(block.getRelative(event.getBlockFace()).getLocation()); | ||||
|                     eventType = PlayerBlockEventType.PLACE_MISC; | ||||
|                 } | ||||
|                 if (Tag.ITEMS_BOATS.isTagged(type) || MINECARTS.contains(type)) { | ||||
|                     eventType = PlayerBlockEventType.PLACE_VEHICLE; | ||||
|                     break; | ||||
|                 } | ||||
|                 if (type == Material.FIREWORK_ROCKET || type == Material.FIREWORK_STAR) { | ||||
|                     eventType = PlayerBlockEventType.SPAWN_MOB; | ||||
|                     break; | ||||
|                 } | ||||
|                 if (BOOKS.contains(type)) { | ||||
|                     eventType = PlayerBlockEventType.READ; | ||||
|                     break; | ||||
|                 } | ||||
|                 break; | ||||
|             } | ||||
|   | ||||
| @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. | ||||
| ## Enforcement | ||||
|  | ||||
| Instances of abusive, harassing, or otherwise unacceptable behavior may be | ||||
| reported by contacting the project team at contact@alexander-soderberg.com. All | ||||
| reported by contacting the project team at contact@intellectualsites.com. All | ||||
| complaints will be reviewed and investigated and will result in a response that | ||||
| is deemed necessary and appropriate to the circumstances. The project team is | ||||
| obligated to maintain confidentiality with regard to the reporter of an incident. | ||||
|   | ||||
| @@ -2,18 +2,18 @@ import java.time.format.DateTimeFormatter | ||||
|  | ||||
| dependencies { | ||||
|     // Expected everywhere. | ||||
|     compileOnlyApi(libs.checkerqual) | ||||
|     compileOnlyApi("org.checkerframework:checker-qual") | ||||
|  | ||||
|     // Minecraft expectations | ||||
|     compileOnlyApi(libs.gson) | ||||
|     compileOnly(libs.guava) | ||||
|     compileOnlyApi("com.google.code.gson:gson") | ||||
|     compileOnly("com.google.guava:guava") | ||||
|  | ||||
|     // Platform expectations | ||||
|     compileOnlyApi(libs.snakeyaml) | ||||
|     compileOnlyApi("org.yaml:snakeyaml") | ||||
|  | ||||
|     // Adventure | ||||
|     api(libs.adventure) | ||||
|     api(libs.minimessage) | ||||
|     api("net.kyori:adventure-api") | ||||
|     api("net.kyori:adventure-text-minimessage") | ||||
|  | ||||
|     // Guice | ||||
|     api(libs.guice) { | ||||
| @@ -31,18 +31,18 @@ dependencies { | ||||
|         exclude(group = "dummypermscompat") | ||||
|     } | ||||
|     testImplementation(libs.worldeditCore) | ||||
|     compileOnly(libs.fastasyncworldeditCore) { isTransitive = false } | ||||
|     testImplementation(libs.fastasyncworldeditCore) { isTransitive = false } | ||||
|     compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false } | ||||
|     testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false } | ||||
|  | ||||
|     // Logging | ||||
|     compileOnlyApi(libs.log4j) | ||||
|     compileOnlyApi("org.apache.logging.log4j:log4j-api") | ||||
|  | ||||
|     // Other libraries | ||||
|     api(libs.prtree) | ||||
|     api(libs.aopalliance) | ||||
|     api(libs.cloudServices) | ||||
|     api(libs.arkitektonika) | ||||
|     api(libs.paster) | ||||
|     api("com.intellectualsites.paster:Paster") | ||||
| } | ||||
|  | ||||
| tasks.processResources { | ||||
|   | ||||
| @@ -72,7 +72,10 @@ import com.plotsquared.core.util.ReflectionUtils; | ||||
| import com.plotsquared.core.util.task.TaskManager; | ||||
| import com.plotsquared.core.uuid.UUIDPipeline; | ||||
| import com.sk89q.worldedit.WorldEdit; | ||||
| import com.sk89q.worldedit.event.platform.PlatformReadyEvent; | ||||
| import com.sk89q.worldedit.math.BlockVector2; | ||||
| import com.sk89q.worldedit.util.eventbus.EventHandler; | ||||
| import com.sk89q.worldedit.util.eventbus.Subscribe; | ||||
| import org.apache.logging.log4j.LogManager; | ||||
| import org.apache.logging.log4j.Logger; | ||||
| import org.checkerframework.checker.nullness.qual.MonotonicNonNull; | ||||
| @@ -153,6 +156,8 @@ public class PlotSquared { | ||||
|     private EventDispatcher eventDispatcher; | ||||
|     private PlotListener plotListener; | ||||
|  | ||||
|     private boolean weInitialised; | ||||
|  | ||||
|     /** | ||||
|      * Initialize PlotSquared with the desired Implementation class. | ||||
|      * | ||||
| @@ -223,6 +228,7 @@ public class PlotSquared { | ||||
|             } | ||||
|  | ||||
|             this.worldedit = WorldEdit.getInstance(); | ||||
|             WorldEdit.getInstance().getEventBus().register(new WEPlatformReadyListener()); | ||||
|  | ||||
|             // Create Event utility class | ||||
|             this.eventDispatcher = new EventDispatcher(this.worldedit); | ||||
| @@ -1574,6 +1580,13 @@ public class PlotSquared { | ||||
|         return this.plotListener; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Get if the {@link PlatformReadyEvent} has been sent by WE. There is no way to query this within WE itself. | ||||
|      */ | ||||
|     public boolean isWeInitialised() { | ||||
|         return weInitialised; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Different ways of sorting {@link Plot plots} | ||||
|      */ | ||||
| @@ -1596,4 +1609,15 @@ public class PlotSquared { | ||||
|         DISTANCE_FROM_ORIGIN | ||||
|     } | ||||
|  | ||||
|     private final class WEPlatformReadyListener { | ||||
|  | ||||
|         @SuppressWarnings("unused") | ||||
|         @Subscribe(priority = EventHandler.Priority.VERY_EARLY) | ||||
|         public void onPlatformReady(PlatformReadyEvent event) { | ||||
|             weInitialised = true; | ||||
|             WorldEdit.getInstance().getEventBus().unregister(WEPlatformReadyListener.this); | ||||
|         } | ||||
|  | ||||
|     } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -161,6 +161,7 @@ public class Deny extends SubCommand { | ||||
|     } | ||||
|  | ||||
|     private void handleKick(PlotPlayer<?> player, Plot plot) { | ||||
|         plot = plot.getBasePlot(false); | ||||
|         if (player == null) { | ||||
|             return; | ||||
|         } | ||||
|   | ||||
| @@ -53,9 +53,15 @@ public abstract class IndependentPlotGenerator { | ||||
|      * | ||||
|      * @param result   queue | ||||
|      * @param settings PlotArea (settings) | ||||
|      * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. | ||||
|      */ | ||||
|     @Deprecated(forRemoval = true, since = "TODO") | ||||
|     public abstract void generateChunk(ScopedQueueCoordinator result, PlotArea settings); | ||||
|  | ||||
|     /** | ||||
|      * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. | ||||
|      */ | ||||
|     @Deprecated(forRemoval = true, since = "TODO") | ||||
|     public boolean populateChunk(ScopedQueueCoordinator result, PlotArea setting) { | ||||
|         return false; | ||||
|     } | ||||
|   | ||||
| @@ -93,7 +93,9 @@ public abstract class QueueCoordinator { | ||||
|      * @param z chunk z coordinate | ||||
|      * @return a new {@link ScopedQueueCoordinator} | ||||
|      * @since 6.6.0 | ||||
|      * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. | ||||
|      */ | ||||
|     @Deprecated(forRemoval = true, since = "TODO") | ||||
|     public ScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) { | ||||
|         int bx = x << 4; | ||||
|         int bz = z << 4; | ||||
|   | ||||
| @@ -42,6 +42,10 @@ public abstract class ChunkManager { | ||||
|     private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> forceChunks = new ConcurrentHashMap<>(); | ||||
|     private static final Map<BlockVector2, RunnableVal<ScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>(); | ||||
|  | ||||
|     /** | ||||
|      * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. | ||||
|      */ | ||||
|     @Deprecated(forRemoval = true, since = "TODO") | ||||
|     public static void setChunkInPlotArea( | ||||
|             RunnableVal<ScopedQueueCoordinator> force, | ||||
|             RunnableVal<ScopedQueueCoordinator> add, | ||||
| @@ -79,6 +83,10 @@ public abstract class ChunkManager { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. | ||||
|      */ | ||||
|     @Deprecated(forRemoval = true, since = "TODO") | ||||
|     public static boolean preProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) { | ||||
|         final RunnableVal<ScopedQueueCoordinator> forceChunk = forceChunks.get(loc); | ||||
|         if (forceChunk != null) { | ||||
| @@ -89,6 +97,10 @@ public abstract class ChunkManager { | ||||
|         return false; | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @deprecated {@link ScopedQueueCoordinator} will be renamed in v7. | ||||
|      */ | ||||
|     @Deprecated(forRemoval = true, since = "TODO") | ||||
|     public static boolean postProcessChunk(BlockVector2 loc, ScopedQueueCoordinator queue) { | ||||
|         final RunnableVal<ScopedQueueCoordinator> addChunk = forceChunks.get(loc); | ||||
|         if (addChunk != null) { | ||||
|   | ||||
| @@ -38,6 +38,7 @@ import com.plotsquared.core.player.PlotPlayer; | ||||
| import com.plotsquared.core.plot.Plot; | ||||
| import com.plotsquared.core.plot.flag.GlobalFlagContainer; | ||||
| import com.plotsquared.core.plot.flag.PlotFlag; | ||||
| import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag; | ||||
| import com.plotsquared.core.util.EventDispatcher; | ||||
| import com.plotsquared.core.util.PlayerManager; | ||||
| import net.kyori.adventure.text.Component; | ||||
| @@ -110,6 +111,9 @@ public final class PlaceholderRegistry { | ||||
|             return plot.getAlias(); | ||||
|         }); | ||||
|         this.createPlaceholder("currentplot_owner", (player, plot) -> { | ||||
|             if (plot.getFlag(ServerPlotFlag.class)){ | ||||
|                 return legacyComponent(TranslatableCaption.of("info.server"), player); | ||||
|             } | ||||
|             final UUID plotOwner = plot.getOwnerAbs(); | ||||
|             if (plotOwner == null) { | ||||
|                 return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player); | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| <p align="center"> | ||||
|     <img src="https://i.imgur.com/33Y65YL.png" width="150"> | ||||
|     <img src="https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.svg" width="300"> | ||||
| </p> | ||||
|  | ||||
| --- | ||||
|   | ||||
| @@ -18,7 +18,7 @@ plugins { | ||||
|     idea | ||||
| } | ||||
|  | ||||
| version = "6.8.0" | ||||
| version = "6.8.2-SNAPSHOT" | ||||
|  | ||||
| allprojects { | ||||
|     group = "com.plotsquared" | ||||
| @@ -34,7 +34,7 @@ allprojects { | ||||
|  | ||||
|         maven { | ||||
|             name = "Sonatype OSS (S01)" | ||||
|             url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots") | ||||
|             url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/") | ||||
|         } | ||||
|  | ||||
|         maven { | ||||
| @@ -64,9 +64,12 @@ subprojects { | ||||
|         plugin<EclipsePlugin>() | ||||
|         plugin<IdeaPlugin>() | ||||
|     } | ||||
|  | ||||
|     dependencies { | ||||
|         implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.2")) | ||||
|     } | ||||
| } | ||||
|  | ||||
| val javadocDir = rootDir.resolve("docs").resolve("javadoc").resolve(project.name) | ||||
| allprojects { | ||||
|     dependencies { | ||||
|         // Tests | ||||
| @@ -172,11 +175,6 @@ allprojects { | ||||
|     } | ||||
|  | ||||
|     tasks { | ||||
|         named<Delete>("clean") { | ||||
|             doFirst { | ||||
|                 javadocDir.deleteRecursively() | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         compileJava { | ||||
|             options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000")) | ||||
| @@ -187,16 +185,6 @@ allprojects { | ||||
|             options.encoding = "UTF-8" | ||||
|         } | ||||
|  | ||||
|         javadoc { | ||||
|             val opt = options as StandardJavadocDocletOptions | ||||
|             opt.addStringOption("Xdoclint:none", "-quiet") | ||||
|             opt.tags( | ||||
|                     "apiNote:a:API Note:", | ||||
|                     "implSpec:a:Implementation Requirements:", | ||||
|                     "implNote:a:Implementation Note:" | ||||
|             ) | ||||
|         } | ||||
|  | ||||
|         shadowJar { | ||||
|             this.archiveClassifier.set(null as String?) | ||||
|             this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}") | ||||
| @@ -221,37 +209,3 @@ nexusPublishing { | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| tasks { | ||||
|     val aggregatedJavadocs = create<Javadoc>("aggregatedJavadocs") { | ||||
|         title = "${project.name} ${project.version} API" | ||||
|         setDestinationDir(javadocDir) | ||||
|         options.destinationDirectory = javadocDir | ||||
|  | ||||
|         doFirst { | ||||
|             javadocDir.deleteRecursively() | ||||
|         } | ||||
|     }.also { | ||||
|         it.group = "Documentation" | ||||
|         it.description = "Generate javadocs from all child projects as if it was a single project" | ||||
|     } | ||||
|  | ||||
|     subprojects.forEach { subProject -> | ||||
|         subProject.afterEvaluate { | ||||
|             subProject.tasks.withType<Javadoc>().forEach { task -> | ||||
|                 aggregatedJavadocs.source += task.source | ||||
|                 aggregatedJavadocs.classpath += task.classpath | ||||
|                 aggregatedJavadocs.excludes += task.excludes | ||||
|                 aggregatedJavadocs.includes += task.includes | ||||
|  | ||||
|                 val rootOptions = aggregatedJavadocs.options as StandardJavadocDocletOptions | ||||
|                 val subOptions = task.options as StandardJavadocDocletOptions | ||||
|                 rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty().toSet()).toTypedArray()) | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     build { | ||||
|         dependsOn(aggregatedJavadocs) | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -1,15 +1,9 @@ | ||||
| [versions] | ||||
| # Minecraft expectations | ||||
| gson = "2.8.8" # Version set by Minecraft | ||||
| log4j-api = "2.17.1" # Version set by Minecraft | ||||
| guava = "31.0.1-jre" # Version set by Minecraft | ||||
|  | ||||
| # Platform expectations | ||||
| paper = "1.18.1-R0.1-SNAPSHOT" | ||||
| checker-qual = "3.22.0" | ||||
| guice = "5.1.0" | ||||
| spotbugs = "4.7.0" | ||||
| snakeyaml = "1.30" # Version set by Bukkit | ||||
|  | ||||
| # Adventure & MiniMessage | ||||
| adventure-api = "4.9.3" | ||||
| @@ -18,8 +12,6 @@ adventure-platform-bukkit = "4.0.1" | ||||
|  | ||||
| # Plugins | ||||
| worldedit = "7.2.10" | ||||
| fawe = "2.1.2" | ||||
| vault = "1.7.1" | ||||
| placeholderapi = "2.11.1" | ||||
| luckperms = "5.4" | ||||
| essentialsx = "2.19.4" | ||||
| @@ -30,11 +22,7 @@ prtree = "2.0.0" | ||||
| aopalliance = "1.0" | ||||
| cloud-services = "1.6.2" | ||||
| arkitektonika = "2.1.1" | ||||
| paster = "1.1.4" | ||||
| bstats = "3.0.0" | ||||
| paperlib = "1.0.7" | ||||
| squirrelid = "0.3.1" | ||||
| serverlib = "2.3.1" | ||||
| http4j = "1.3" | ||||
|  | ||||
| # Gradle plugins | ||||
| @@ -48,12 +36,7 @@ nexus = "1.1.0" | ||||
| paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } | ||||
| checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" } | ||||
|  | ||||
| # Minecraft expectations | ||||
| gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" } | ||||
| log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j-api" } | ||||
|  | ||||
| # Platform expectations | ||||
| snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" } | ||||
| guice = { group = "com.google.inject", name = "guice", version.ref = "guice" } | ||||
| guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" } | ||||
| spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" } | ||||
| @@ -66,9 +49,6 @@ adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukk | ||||
| # Plugins | ||||
| worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" } | ||||
| worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" } | ||||
| fastasyncworldeditBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" } | ||||
| fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" } | ||||
| vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" } | ||||
| placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" } | ||||
| luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" } | ||||
| essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" } | ||||
| @@ -79,13 +59,8 @@ aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopa | ||||
| cloudServices = { group = "cloud.commandframework", name = "cloud-services", version.ref = "cloud-services" } | ||||
| mvdwapi = { group = "com.intellectualsites.mvdwplaceholderapi", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" } | ||||
| squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" } | ||||
| serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" } | ||||
| bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" } | ||||
| paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" } | ||||
| arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" } | ||||
| http4j = { group = "com.intellectualsites.http", name = "HTTP4J", version.ref = "http4j" } | ||||
| paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" } | ||||
| guava = { group = "com.google.guava", name = "guava", version.ref = "guava" } | ||||
|  | ||||
| [plugins] | ||||
| shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } | ||||
|   | ||||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 36 KiB | 
		Reference in New Issue
	
	Block a user