Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
5059ada Move log message for named entity deaths into correct location (#6105)
b5be382 Add methods to ProtoWorld for working with BlockStates (#5929)
144e5f7 Add option for logging named entity deaths (#6107)
4aef035 [ci skip] Use Java toolchain for run tasks (#6108)
dafc064 Fix MobEffectArgument#getEffect reobf
648f607 Route sign run_command click events through normal chat logic (#6109)
351a2c3 Drop no longer needed patch (#6115)
bb44da8 Fix cancelling EntityPickupItemEvent for villagers (#6091)
This commit is contained in:
William Blake Galbreath
2021-07-07 14:50:53 -05:00
parent afab9a73ef
commit 444413bba6
15 changed files with 38 additions and 38 deletions

View File

@@ -17,10 +17,10 @@ index a12fcb4be21f32933cee916c863d6637ad87ef15..8197ad7db6ec1a750b732e597af75f41
public void absMoveTo(double x, double y, double z) {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 16a507780822e0118f40acae1dff5606136e4806..6dd8ee52c29e0df1c6d0abd547618ccedd9f4bcc 100644
index a88b37884e564303a86422cf50faadaf41b9d3f3..df6e71ee5b151b0b319defb4b9fd10858ff03bbd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2880,7 +2880,7 @@ public abstract class LivingEntity extends Entity {
@@ -2883,7 +2883,7 @@ public abstract class LivingEntity extends Entity {
}
}