From 45102fcf284d3c713d3f161123e0771396475b21 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Tue, 16 May 2017 21:22:07 +1000
Subject: Misc advancement / recipe reload fixes including SPIGOT-3240

---
 nms-patches/PlayerList.patch | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

(limited to 'nms-patches/PlayerList.patch')

diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch
index 95309563..e78caad1 100644
--- a/nms-patches/PlayerList.patch
+++ b/nms-patches/PlayerList.patch
@@ -601,13 +601,13 @@
 +        double d1 = enter.getZ();
 +         double d2 = 8.0D;
 +        /*
-         double d0 = entity.locX;
-         double d1 = entity.locZ;
-         double d2 = 8.0D;
-         float f = entity.yaw;
++        double d0 = entity.locX;
++        double d1 = entity.locZ;
++        double d2 = 8.0D;
++        float f = entity.yaw;
 +        */
- 
-         worldserver.methodProfiler.a("moving");
++
++        worldserver.methodProfiler.a("moving");
 +        if (worldserver1.dimension == -1) {
 +            d0 = MathHelper.a(d0 / d2, worldserver1.getWorldBorder().b()+ 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
 +            d1 = MathHelper.a(d1 / d2, worldserver1.getWorldBorder().c() + 16.0D, worldserver1.getWorldBorder().e() - 16.0D);
@@ -676,13 +676,13 @@
 +        int i = worldserver.dimension;
 +
 +        /*
-+        double d0 = entity.locX;
-+        double d1 = entity.locZ;
-+        double d2 = 8.0D;
-+        float f = entity.yaw;
+         double d0 = entity.locX;
+         double d1 = entity.locZ;
+         double d2 = 8.0D;
+         float f = entity.yaw;
 +        */
-+
-+        worldserver.methodProfiler.a("moving");
+ 
+         worldserver.methodProfiler.a("moving");
 +        entity.setPositionRotation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch());
 +        if (entity.isAlive()) {
 +            worldserver.entityJoinedWorld(entity, false);
@@ -918,3 +918,15 @@
  
                  if (worldserver != null) {
                      worldserver.getPlayerChunkMap().a(i);
+@@ -941,6 +1411,11 @@
+ 
+             advancementdataplayer.b();
+         }
++        // CraftBukkit start - trigger immediate flush of advancements
++        for (EntityPlayer player : players) {
++            player.getAdvancementData().b(player);
++        }
++        // CraftBukkit end
+ 
+     }
+ }
-- 
cgit v1.2.3