Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
826e09f3 Light improvements
e3e1191a Preserve initial velocity of spawned entities - Fixes #4292
bd648dfb Optimize some methods for inlining
9efe0710 Only consider chunks Loaded if at BORDER status
298c9022 Updated Upstream (Bukkit/CraftBukkit/Spigot)
d9467169 [Auto] Updated Upstream (CraftBukkit)
d802a50a Extend block drop capture to capture all items added to the world (Fixes #4307)
This commit is contained in:
William Blake Galbreath
2020-09-20 09:57:51 -05:00
parent 09e0103ee1
commit 9d49a318f7
20 changed files with 302 additions and 225 deletions

View File

@@ -17,7 +17,7 @@ index 702242653..9f4f56c47 100644
@Override
diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
index 8921c2333..da79c7e63 100644
index 191d9cb82..9f74d6e88 100644
--- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
+++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -210,7 +210,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@@ -30,7 +30,7 @@ index 8921c2333..da79c7e63 100644
protected int getChestSlots() {
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index ec9174206..c9cff4c07 100644
index 0e000c718..baf35465b 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -133,6 +133,7 @@ public abstract class EntityLiving extends Entity {
@@ -62,10 +62,10 @@ index ec9174206..c9cff4c07 100644
protected void playBlockStepSound() {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 22705cda3..ec4b30b7f 100644
index 9e9bdf9bc..2fd4bc818 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -798,4 +798,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -809,4 +809,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().receive(((CraftItem) item).getHandle(), quantity);
}
// Paper end