summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2018-11-23 14:20:59 +1100
committermd_5 <git@md-5.net>2018-11-23 14:20:59 +1100
commit8cd538e66144bd93f9139574b179b2413ee5dd62 (patch)
tree561e4adc86aff5405300b8d29b5bc2bbce31e121 /src/main/java/org
parentb4ee04baae8fc9bddd37950fc444aab692795ea6 (diff)
downloadcraftbukkit-8cd538e66144bd93f9139574b179b2413ee5dd62.tar
craftbukkit-8cd538e66144bd93f9139574b179b2413ee5dd62.tar.gz
craftbukkit-8cd538e66144bd93f9139574b179b2413ee5dd62.tar.lz
craftbukkit-8cd538e66144bd93f9139574b179b2413ee5dd62.tar.xz
craftbukkit-8cd538e66144bd93f9139574b179b2413ee5dd62.zip
SPIGOT-4498: Crash on startup
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
index adacb60a..15c62552 100644
--- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
+++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
@@ -105,7 +105,7 @@ class CraftTask implements BukkitTask, Runnable {
}
Class<?> getTaskClass() {
- return (rTask != null) ? rTask.getClass() : cTask.getClass();
+ return (rTask != null) ? rTask.getClass() : ((cTask != null) ? cTask.getClass() : null);
}
@Override