Updated Upstream (Paper & Airplane) (#298)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b8020379c Extract Adventure Version into a variable, add reminder to update the linked JD on the homepage (#5422)

Airplane Changes:
f5fb02447 Temporarily revert patch
3c728a7a9 Oops, these 2 too
37a93e561 Your daily dose of 1-3% optimization patches
bbd689a77 Remove useless check
This commit is contained in:
Ben Kerllenevich
2021-04-27 07:21:31 -04:00
committed by GitHub
parent eb07368fad
commit 3dce9755f3
47 changed files with 229 additions and 236 deletions

View File

@@ -17,10 +17,10 @@ index e0694ff71102313634c9d3836ea9f48e7f41c23a..79b65c1fa9c5ab7b840172da5d0c2ec2
// CraftBukkit end
this.spawnIn(worldserver);
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 9053a36e9397a6cfa49edd5100c0cc77fa1a1e4b..d0537b9deb71b9f064e63caf33dce98d8d0ba205 100644
index 2545b0891a299301a8d9e194e795b0f3856f2178..fdd374232ced8f4da675afaee3f5278c036ef112 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -2553,12 +2553,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -2551,12 +2551,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
return new Vec2F(this.pitch, this.yaw);
}