Fix NPE

TechnicallyCoded · Mar 11, 2024 · d4a572c · d4a572c
1 parent 271d576
commit d4a572c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java b/platform/folia/src/main/java/com/tcoded/folialib/impl/FoliaImplementation.java
@@ -461,7 +461,8 @@ public CompletableFuture<Boolean> teleportAsync(Player player, Location location
 	@Override
     public WrappedTask wrapTask(Object nativeTask) {
         if (!(nativeTask instanceof ScheduledTask)) {
-            throw new IllegalArgumentException("The nativeTask provided must be a ScheduledTask. Got: " + nativeTask.getClass().getName() + " instead.");
+            String nativeTaskClassName = nativeTask == null ? null : nativeTask.getClass().getName();
+            throw new IllegalArgumentException("The nativeTask provided must be a ScheduledTask. Got: " + nativeTaskClassName + " instead.");
         }
 
         return new WrappedFoliaTask((ScheduledTask) nativeTask);

diff --git a/...form/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java b/...form/legacy-spigot/src/main/java/com/tcoded/folialib/impl/LegacySpigotImplementation.java
@@ -348,7 +348,8 @@ public CompletableFuture<Boolean> teleportAsync(Player player, Location location
     @Override
     public WrappedTask wrapTask(Object nativeTask) {
         if (!(nativeTask instanceof BukkitTask)) {
-            throw new IllegalArgumentException("The nativeTask provided must be a BukkitTask. Got: " + nativeTask.getClass().getName() + " instead.");
+            String nativeTaskClassName = nativeTask == null ? null : nativeTask.getClass().getName();
+            throw new IllegalArgumentException("The nativeTask provided must be a BukkitTask. Got: " + nativeTaskClassName + " instead.");
         }
 
         return ImplementationTestsUtil.isCancelledSupported() ?

diff --git a/platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java b/platform/spigot/src/main/java/com/tcoded/folialib/impl/SpigotImplementation.java
@@ -334,7 +334,8 @@ public CompletableFuture<Boolean> teleportAsync(Player player, Location location
     @Override
     public WrappedTask wrapTask(Object nativeTask) {
         if (!(nativeTask instanceof BukkitTask)) {
-            throw new IllegalArgumentException("The nativeTask provided must be a BukkitTask. Got: " + nativeTask.getClass().getName() + " instead.");
+            String nativeTaskClassName = nativeTask == null ? null : nativeTask.getClass().getName();
+            throw new IllegalArgumentException("The nativeTask provided must be a BukkitTask. Got: " + nativeTaskClassName + " instead.");
         }
 
         return new WrappedBukkitTask((BukkitTask) nativeTask);