Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8ce3dd5f [CI-SKIP] Fix Mojang API Brigadier dep - THIS IS NOT A NEW BUILD
00d760a5 Fix build due to spigot changing the build timestamp process
842e040c Updated Upstream (Bukkit/CraftBukkit/Spigot)
c03260a2 Add getter and setter for villager's numberOfRestocksToday (#3231)
fe366fbe null check tracker for entity metadata update - Fixes #3070
fdf41b74 Implement Brigadier Mojang API
e0ea2e0e Entity Activation Range 2.0! Major improvements to restoring behavior
10396d28 Fix Tracking Range mismatch on Vehicle/Passenger checks
This commit is contained in:
William Blake Galbreath
2020-04-28 20:14:57 -05:00
parent c0e748c0c1
commit a2db5eebbe
67 changed files with 269 additions and 999 deletions

View File

@@ -1,4 +1,4 @@
From 71159c88e6b9e9af5880fb437dc45b1b6928eec1 Mon Sep 17 00:00:00 2001
From 79f43a500717fdc8e061212aff96adaaf6f543a8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 30 Nov 2019 03:30:17 -0600
Subject: [PATCH] Add sleep options
@@ -9,7 +9,7 @@ Subject: [PATCH] Add sleep options
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index 5ac3c4641..ed0a559f9 100644
index d62174e9c..22e17e3de 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -143,6 +143,21 @@ public abstract class EntityHuman extends EntityLiving {
@@ -43,7 +43,7 @@ index 5ac3c4641..ed0a559f9 100644
this.wakeup(false, true);
}
} else if (this.sleepTicks > 0) {
@@ -1338,7 +1353,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -1334,7 +1349,7 @@ public abstract class EntityHuman extends EntityLiving {
return Either.left(EntityHuman.EnumBedResult.NOT_POSSIBLE_HERE);
}