Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
cdd0bb43 Update upstream CB/S
4ac40031 [CI-SKIP] The wheel in the sky keeps on turning
9530f1bd [CI-SKIP] Fix regression with scripts in directories with spaces
This commit is contained in:
William Blake Galbreath
2019-08-10 20:37:31 -05:00
parent 9da734157d
commit 6647b4b010
3 changed files with 5 additions and 5 deletions

2
Paper

Submodule Paper updated: aa022fdaca...cdd0bb4376

View File

@@ -1 +1 @@
1.14.4--843248aa07e132b5f8da61b47c3503c6d73680f1
1.14.4--9a331db94dcd70a7f484a1af9896e74d0de44e08

View File

@@ -1,4 +1,4 @@
From f76fd5d572d79451fb1c06d8ab241e52054a8505 Mon Sep 17 00:00:00 2001
From 022df48e1fb9475f3a6ff5f2baf2ab7e4ae8947c 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
@@ -762,7 +762,7 @@ index 90479feb4..884d14e1c 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
}
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index 1da2f013f..9bf665f51 100644
index ca38ccf76..e9f6b3931 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal {
@@ -890,7 +890,7 @@ index 1da2f013f..9bf665f51 100644
}
}
@@ -1349,16 +1380,16 @@ public class EntityFox extends EntityAnimal {
@@ -1361,16 +1392,16 @@ public class EntityFox extends EntityAnimal {
}
}