Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7e8ae207 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2019-07-11 21:45:34 -05:00
parent 02e31ae620
commit abd93908c7
5 changed files with 14 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
From 902abbbaa4d70696b4632d176da085a41bdb4728 Mon Sep 17 00:00:00 2001
From da7579b21c43d655f722bc1d24bec3f76cc8d2d3 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -165,7 +165,7 @@ index 454627f65..df3d6cf28 100644
this.d = false;
this.a.aM = this.a(this.a.aM, this.h() + 20.0F, this.b);
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index adfd6e855..cf5d829f6 100644
index 0ff92183f..01c8452bb 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -78,6 +78,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -223,7 +223,7 @@ index adfd6e855..cf5d829f6 100644
this.passengers.remove(entity);
entity.j = 60;
}
@@ -3276,4 +3291,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3275,4 +3290,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setMot(double d0, double d1, double d2) {
this.setMot(new Vec3D(d0, d1, d2));
}