Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a7cddc4 Hotfix for some of the reobf issues tracked in Paperweight issue 24 (#5965)
b1f6e26 Fix mobs not burning from summon command (#5961)
4e2f0be Refactor Anti-Xray and make some fixes to it (#5938)
d50cc01 Make gradle take build number from env vars and add git build info (#5890)
This commit is contained in:
William Blake Galbreath
2021-06-23 16:46:21 -05:00
parent 0babd7cad8
commit 921a000994
13 changed files with 56 additions and 59 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a098509d007edf 100644
index 916c29d08fbcf245ad6f50f8e8cc173677b01081..c55aba456aa144e58fc35877c61eff309eaa391f 100644
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
@@ -51,6 +51,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -25,7 +25,7 @@ index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a09850
this.setSecondsOnFire(8);
}
@@ -628,6 +629,12 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -630,6 +631,12 @@ public class Phantom extends FlyingMob implements Enemy {
return false;
} else if (!entityliving.isAlive()) {
return false;
@@ -38,7 +38,7 @@ index ddd48367c37d3ca3472fc9a8730f71f2e96743c2..007437edff2db6044adf9afca4a09850
} else if (entityliving instanceof Player && (((Player) entityliving).isSpectator() || ((Player) entityliving).isCreative())) {
return false;
} else if (!this.canUse()) {
@@ -765,6 +772,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -767,6 +774,7 @@ public class Phantom extends FlyingMob implements Enemy {
this.nextScanTick = 60;
List<Player> list = Phantom.this.level.getNearbyPlayers(this.attackTargeting, (LivingEntity) Phantom.this, Phantom.this.getBoundingBox().inflate(16.0D, 64.0D, 16.0D));