mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			fix/IOOBE-
			...
			fix/v7/ref
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 21a94104be | 
| @@ -1171,7 +1171,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl | ||||
|     @Override | ||||
|     public @NonNull String serverNativePackage() { | ||||
|         final String name = Bukkit.getServer().getClass().getPackage().getName(); | ||||
|         return name.substring(name.lastIndexOf('.') + 1); | ||||
|         String ver = name.substring(name.lastIndexOf('.') + 1); | ||||
|         // org.bukkit.craftbukkit is no longer suffixed by a version | ||||
|         return ver.equals("craftbukkit") ? "" : ver; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|   | ||||
| @@ -49,9 +49,14 @@ public class SingleWorldListener implements Listener { | ||||
|             this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod(); | ||||
|         } catch (NoSuchMethodException ignored) { | ||||
|             try { | ||||
|                 ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus"); | ||||
|                 String chunkStatus = PlotSquared.platform().serverVersion()[1] < 21 | ||||
|                         ? "net.minecraft.world.level.chunk" + ".ChunkStatus" | ||||
|                         : "net.minecraft.world.level.chunk.status.ChunkStatus"; | ||||
|                 ReflectionUtils.RefClass classChunkStatus = getRefClass(chunkStatus); | ||||
|                 this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null); | ||||
|                 this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod(); | ||||
|                 this.methodGetHandleChunk = classCraftChunk | ||||
|                         .getMethod("getHandle", classChunkStatus.getRealClass()) | ||||
|                         .getRealMethod(); | ||||
|             } catch (NoSuchMethodException ex) { | ||||
|                 throw new RuntimeException(ex); | ||||
|             } | ||||
|   | ||||
| @@ -206,7 +206,8 @@ public class PlotSquared { | ||||
|         GlobalFlagContainer.setup(); | ||||
|  | ||||
|         try { | ||||
|             new ReflectionUtils(this.platform.serverNativePackage()); | ||||
|             String ver = this.platform.serverNativePackage(); | ||||
|             new ReflectionUtils(ver.isEmpty() ? null : ver); | ||||
|             try { | ||||
|                 URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation(); | ||||
|                 this.jarFile = new File( | ||||
| @@ -214,7 +215,7 @@ public class PlotSquared { | ||||
|                                 logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file")) | ||||
|                                 .getPath()); | ||||
|             } catch (URISyntaxException | SecurityException e) { | ||||
|                 e.printStackTrace(); | ||||
|                 LOGGER.error(e); | ||||
|                 this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar"); | ||||
|                 if (!this.jarFile.exists()) { | ||||
|                     this.jarFile = new File( | ||||
| @@ -238,7 +239,7 @@ public class PlotSquared { | ||||
|             copyFile("skyblock.template", Settings.Paths.TEMPLATES); | ||||
|             showDebug(); | ||||
|         } catch (Throwable e) { | ||||
|             e.printStackTrace(); | ||||
|             LOGGER.error(e); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user