diff --git a/pom.xml b/pom.xml
index 7c765f2be..738932548 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     <dependencies>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
-            <artifactId>paper-api</artifactId>
+            <artifactId>akarin-api</artifactId>
             <version>${api.version}</version> <!-- Akarin - allows different implemention version -->
             <scope>compile</scope>
         </dependency>
diff --git a/src/main/java/io/akarin/server/core/AkarinCreatureSpanwner.java b/src/main/java/io/akarin/server/core/AkarinCreatureSpanwner.java
index a7d291136..c2acc5554 100644
--- a/src/main/java/io/akarin/server/core/AkarinCreatureSpanwner.java
+++ b/src/main/java/io/akarin/server/core/AkarinCreatureSpanwner.java
@@ -73,6 +73,7 @@ public class AkarinCreatureSpanwner {
         
         if (PlayerNaturallySpawnCreaturesEvent.getHandlerList().getRegisteredListeners().length != 0) {
             PlayerNaturallySpawnCreaturesEvent event = new PlayerNaturallySpawnCreaturesEvent((Player) player.getBukkitEntity(), mobSpawnRange);
+            // prevent concurrent handling, at least
             synchronized (PlayerNaturallySpawnCreaturesEvent.class) {
                 Bukkit.getPluginManager().callEvent(event);
             }
diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
index 25b575c44..7b0a6e32a 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
+++ b/src/main/java/net/minecraft/server/NetworkManager.java
@@ -56,7 +56,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
     });
     private final EnumProtocolDirection h;
     private final ConcurrentLinkedQueue<NetworkManager.QueuedPacket> packetQueue = new ConcurrentLinkedQueue<NetworkManager.QueuedPacket>();  private final Queue<NetworkManager.QueuedPacket> getPacketQueue() { return this.packetQueue; } // Paper - OBFHELPER // Akarin
-    private final Queue<PacketPlayOutMapChunk> pendingChunkQueue = Lists.newLinkedList(); // Akarin - remove packet queue
+    private final Queue<PacketPlayOutMapChunk> pendingChunkQueue = Queues.newConcurrentLinkedQueue(); // Akarin - remove packet queue
     private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
     public Channel channel;
     public SocketAddress socketAddress; public void setSpoofedRemoteAddress(SocketAddress address) { this.socketAddress = address; } // Paper - OBFHELPER
diff --git a/work/Paper b/work/Paper
index ab8bbdfd8..9c79f489e 160000
--- a/work/Paper
+++ b/work/Paper
@@ -1 +1 @@
-Subproject commit ab8bbdfd8008deb0241d6ed1c62345c24ed34bd8
+Subproject commit 9c79f489ed6d273a262199c615d4f5449a393248