mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Misc advancement / recipe reload fixes including SPIGOT-3240

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2017-05-16 21:22:07 +10:00
parent 4c88ea37ee
commit 5317a74e0a
8 changed files with 75 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
paper-server/nms-patches/PlayerList.patch
View file

@ -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
}
}