From 28b43d9dc5d17b4ab122b9292c5c8873f90d278e Mon Sep 17 00:00:00 2001
From: Sotr <i@omc.hk>
Date: Sat, 9 Jun 2018 01:20:05 +0800
Subject: [PATCH] Upstream Paper

---
 sources/src/main/java/io/akarin/api/Akari.java | 3 ---
 work/Paper                                     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/sources/src/main/java/io/akarin/api/Akari.java b/sources/src/main/java/io/akarin/api/Akari.java
index 5bd74ca78..ea886603b 100644
--- a/sources/src/main/java/io/akarin/api/Akari.java
+++ b/sources/src/main/java/io/akarin/api/Akari.java
@@ -6,8 +6,6 @@ import java.util.Queue;
 import java.util.concurrent.ExecutorCompletionService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -16,7 +14,6 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import co.aikar.timings.Timing;
 import co.aikar.timings.Timings;
-import net.minecraft.server.WorldData;
 
 public abstract class Akari {
     /**
diff --git a/work/Paper b/work/Paper
index 02eda014a..960b6d19c 160000
--- a/work/Paper
+++ b/work/Paper
@@ -1 +1 @@
-Subproject commit 02eda014a06e0edbe08e844209ec73fef54ff9e4
+Subproject commit 960b6d19cb4ba2bd3a2c72147308110ead640ec4