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

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
commit 83baf22bde
80 changed files with 469 additions and 518 deletions
Download patch file Download diff file Expand all files Collapse all files

26
paper-server/nms-patches/Entity.patch
View file

@ -123,7 +123,7 @@
+ public void postTick() {
+ // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
+ if (!this.world.isClientSide && this.world instanceof WorldServer) {
+ this.world.methodProfiler.a("portal");
+ this.world.methodProfiler.enter("portal");
+ if (this.an) {
+ MinecraftServer minecraftserver = this.world.getMinecraftServer();
+
@ -159,13 +159,13 @@
+ }
+
+ this.E();
+ this.world.methodProfiler.e();
+ this.world.methodProfiler.exit();
+ }
+ }
+ // CraftBukkit end
+
public void W() {
this.world.methodProfiler.a("entityBaseTick");
this.world.methodProfiler.enter("entityBaseTick");
if (this.isPassenger() && this.getVehicle().dead) {
@@ -250,6 +380,8 @@
this.lastZ = this.locZ;
@ -174,11 +174,11 @@
+ // Moved up to postTick
+ /*
if (!this.world.isClientSide && this.world instanceof WorldServer) {
this.world.methodProfiler.a("portal");
this.world.methodProfiler.enter("portal");
if (this.an) {
@@ -289,6 +421,7 @@
this.E();
this.world.methodProfiler.e();
this.world.methodProfiler.exit();
}
+ */
@ -219,7 +219,7 @@
if (this.Q > 0.0F && flag && (d7 != d0 || d9 != d2)) {
@@ -592,7 +741,7 @@
this.world.methodProfiler.a("rest");
this.world.methodProfiler.enter("rest");
this.recalcPosition();
this.positionChanged = d7 != d0 || d9 != d2;
- this.C = d1 != d1;
@ -602,7 +602,7 @@
public void j(boolean flag) {
@@ -2036,19 +2387,72 @@
if (!this.world.isClientSide && !this.dead) {
this.world.methodProfiler.a("changeDimension");
this.world.methodProfiler.enter("changeDimension");
MinecraftServer minecraftserver = this.bK();
- DimensionManager dimensionmanager1 = this.dimension;
- WorldServer worldserver = minecraftserver.getWorldServer(dimensionmanager1);
@ -647,7 +647,7 @@
+
+ // Need to make sure the profiler state is reset afterwards (but we still want to time the call)
+ Entity entity = this.teleportTo(exit, true);
+ this.world.methodProfiler.e();
+ this.world.methodProfiler.exit();
+ return entity;
+ } else {
+ return null;
@ -671,7 +671,7 @@
this.world.kill(this);
this.dead = false;
this.world.methodProfiler.a("reposition");
this.world.methodProfiler.enter("reposition");
+ /* CraftBukkit start - Handled in calculateTarget
BlockPosition blockposition;
@ -687,7 +687,7 @@
+ worldserver1.getMinecraftServer().getPlayerList().repositionEntity(this, exit, portal);
+ // worldserver.entityJoinedWorld(this, false); // Handled in repositionEntity
+ // CraftBukkit end
this.world.methodProfiler.c("reloading");
this.world.methodProfiler.exitEnter("reloading");
Entity entity = this.P().a((World) worldserver1);
if (entity != null) {
@ -719,11 +719,11 @@
}
this.dead = true;
this.world.methodProfiler.e();
this.world.methodProfiler.exit();
worldserver.p();
worldserver1.p();
- this.world.methodProfiler.e();
+ // this.world.methodProfiler.e(); // CraftBukkit: Moved up to keep balanced
- this.world.methodProfiler.exit();
+ // this.world.methodProfiler.exit(); // CraftBukkit: Moved up to keep balanced
return entity;
} else {
return null;