twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-21 15:23:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

Mappings Update

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-12-13 11:00:00 +11:00
parent 8817bc22d9
commit 83baf22bde
80 changed files with 469 additions and 518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
paper-server/nms-patches/PlayerList.patch
View File

@@ -481,7 +481,7 @@
+ entityplayer1.forceSetPositionRotation(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
+ // CraftBukkit end
worldserver.getChunkProviderServer().getChunkAt((int) entityplayer1.locX >> 4, (int) entityplayer1.locZ >> 4, true, true);
worldserver.getChunkProvider().getChunkAt((int) entityplayer1.locX >> 4, (int) entityplayer1.locZ >> 4, true, true);
- while (!worldserver.getCubes(entityplayer1, entityplayer1.getBoundingBox()) && entityplayer1.locY < 256.0D) {
+ while (avoidSuffocation && !worldserver.getCubes(entityplayer1, entityplayer1.getBoundingBox()) && entityplayer1.locY < 256.0D) {
@@ -635,7 +635,7 @@
float f = entity.yaw;
+ */
worldserver.methodProfiler.a("moving");
worldserver.methodProfiler.enter("moving");
- if (entity.dimension == DimensionManager.NETHER) {
+ if (worldserver1.dimension == DimensionManager.NETHER) {
d0 = MathHelper.a(d0 / 8.0D, worldserver1.getWorldBorder().b() + 16.0D, worldserver1.getWorldBorder().d() - 16.0D);
@@ -679,9 +679,9 @@
+ */
}
worldserver.methodProfiler.e();
worldserver.methodProfiler.exit();
@@ -542,22 +865,119 @@
worldserver.methodProfiler.a("placing");
worldserver.methodProfiler.enter("placing");
d0 = (double) MathHelper.clamp((int) d0, -29999872, 29999872);
d1 = (double) MathHelper.clamp((int) d1, -29999872, 29999872);
+ /*
@@ -693,7 +693,7 @@
}
+ */
+
+ worldserver.methodProfiler.e();
+ worldserver.methodProfiler.exit();
+ }
+
+ // entity.spawnIn(worldserver1);
@@ -713,7 +713,7 @@
+ float f = entity.yaw;
+ */
+
+ worldserver.methodProfiler.a("moving");
+ worldserver.methodProfiler.enter("moving");
+ entity.setPositionRotation(exit.getX(), exit.getY(), exit.getZ(), exit.getYaw(), exit.getPitch());
+ if (entity.isAlive()) {
+ worldserver.entityJoinedWorld(entity, false);
@@ -754,9 +754,9 @@
+ }
+ */
+
+ worldserver.methodProfiler.e();
+ worldserver.methodProfiler.exit();
+ if (dimensionmanager != DimensionManager.THE_END) {
+ worldserver.methodProfiler.a("placing");
+ worldserver.methodProfiler.enter("placing");
+ /*
+ d0 = (double) MathHelper.clamp((int) d0, -29999872, 29999872);
+ d1 = (double) MathHelper.clamp((int) d1, -29999872, 29999872);
@@ -776,7 +776,7 @@
+ worldserver1.entityJoinedWorld(entity, false);
+ }
worldserver.methodProfiler.e();
worldserver.methodProfiler.exit();
}
entity.spawnIn(worldserver1);