mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-08 03:39:48 +01:00
b62dfa0bf9
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers CraftBukkit Changes:1cf8b5dcSPIGOT-4400: Populators running on existing chunks116cb9a1SPIGOT-4399: Add attribute modifier equality test5ee1c18aSPIGOT-4398: Set ASM7_EXPERIMENTAL flag
27 lines
988 B
Diff
27 lines
988 B
Diff
From 5f489d6f0d19763383fc223b8f8b1a0b3743ccf7 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Ennis <dennis@icontact.com>
|
|
Date: Sun, 20 Mar 2016 15:22:42 -0400
|
|
Subject: [PATCH] Catch Async PlayerChunkMap operations
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
index fb593529e1..a69d510dd1 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
|
|
@@ -442,10 +442,12 @@ public class PlayerChunkMap {
|
|
}
|
|
|
|
public void a(PlayerChunk playerchunk) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp("Async Player Chunk Add"); // Paper
|
|
this.f.add(playerchunk);
|
|
}
|
|
|
|
public void b(PlayerChunk playerchunk) {
|
|
+ org.spigotmc.AsyncCatcher.catchOp("Async Player Chunk Remove"); // Paper
|
|
ChunkCoordIntPair chunkcoordintpair = playerchunk.a();
|
|
long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
|
|
|
|
--
|
|
2.19.0
|
|
|