From 7551c72801ede3073e1b6f1d60dac3ea3646b5f7 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sat, 25 Dec 2021 20:54:51 -0600 Subject: [PATCH] Fix #660 --- patches/server/0082-Phantoms-burn-in-light.patch | 6 +++--- patches/server/0188-API-for-any-mob-to-burn-daylight.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/server/0082-Phantoms-burn-in-light.patch b/patches/server/0082-Phantoms-burn-in-light.patch index ee5367bc9..b99629042 100644 --- a/patches/server/0082-Phantoms-burn-in-light.patch +++ b/patches/server/0082-Phantoms-burn-in-light.patch @@ -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 b651ff470853c1c6af2f2c56848a002b066802f5..edb28f9424af0d1973231729785b6ec67b599dbd 100644 +index 5dc5bddfce5b46fd065fd14112febc415e19860c..284532bfe697d288529eacbad0fcfcb6a3680446 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -50,6 +50,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -21,7 +21,7 @@ index b651ff470853c1c6af2f2c56848a002b066802f5..edb28f9424af0d1973231729785b6ec6 @Override public void aiStep() { - if (this.isAlive() && getRider() == null && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning // Purpur -+ if (this.isAlive() && getRider() == null && (((shouldBurnInDay || level.purpurConfig.phantomBurnInDaylight) && this.isSunBurnTick()) || (level.purpurConfig.phantomBurnInLight > 0 && level.getMaxLocalRawBrightness(blockPosition()) >= level.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur ++ if (this.isAlive() && getRider() == null && (((shouldBurnInDay && level.purpurConfig.phantomBurnInDaylight) && this.isSunBurnTick()) || (level.purpurConfig.phantomBurnInLight > 0 && level.getMaxLocalRawBrightness(blockPosition()) >= level.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur this.setSecondsOnFire(8); } @@ -47,7 +47,7 @@ index b651ff470853c1c6af2f2c56848a002b066802f5..edb28f9424af0d1973231729785b6ec6 list.sort(Comparator.comparing((Entity e) -> { return e.getY(); }).reversed()); // CraftBukkit - decompile error Iterator iterator = list.iterator(); diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java -index 49817bb4fb106bccde979bd2a854d24ede409d56..52741957c8b9572c22185f89e05cd5724975cc6b 100644 +index 2fea00ac3d3e3375f9f8da420988a291a3f686ac..2ba75f2852f4b57602f9bffbcebc26f3e4d9d146 100644 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java @@ -1005,6 +1005,9 @@ public class PurpurWorldConfig { diff --git a/patches/server/0188-API-for-any-mob-to-burn-daylight.patch b/patches/server/0188-API-for-any-mob-to-burn-daylight.patch index b6d33c301..261f191ca 100644 --- a/patches/server/0188-API-for-any-mob-to-burn-daylight.patch +++ b/patches/server/0188-API-for-any-mob-to-burn-daylight.patch @@ -209,7 +209,7 @@ index 5458ac83fa555e22ca858f4f596ebb8f37926dd5..ca5683e9b0b4aad3827fe6d00198da8e @Override 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 943d3e6db3212372b4ba8be35e15397f5b8c8a79..10b5c7f58f6f7248e9c97160faf7a52d57a797cf 100644 +index 05eba1970086a42b3609094a3d59119c9d178e74..6ba79e10631ffd213d69c55293ec1da6189c66e3 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java @@ -60,6 +60,7 @@ public class Phantom extends FlyingMob implements Enemy { @@ -224,8 +224,8 @@ index 943d3e6db3212372b4ba8be35e15397f5b8c8a79..10b5c7f58f6f7248e9c97160faf7a52d @Override public void aiStep() { -- if (this.isAlive() && getRider() == null && (((shouldBurnInDay || level.purpurConfig.phantomBurnInDaylight) && this.isSunBurnTick()) || (level.purpurConfig.phantomBurnInLight > 0 && level.getMaxLocalRawBrightness(blockPosition()) >= level.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur -+ if (this.isAlive() && getRider() == null && (((shouldBurnInDay() || level.purpurConfig.phantomBurnInDaylight) && this.isSunBurnTick()) || (level.purpurConfig.phantomBurnInLight > 0 && level.getMaxLocalRawBrightness(blockPosition()) >= level.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur +- if (this.isAlive() && getRider() == null && (((shouldBurnInDay && level.purpurConfig.phantomBurnInDaylight) && this.isSunBurnTick()) || (level.purpurConfig.phantomBurnInLight > 0 && level.getMaxLocalRawBrightness(blockPosition()) >= level.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur ++ if (this.isAlive() && getRider() == null && (((shouldBurnInDay() && level.purpurConfig.phantomBurnInDaylight) && this.isSunBurnTick()) || (level.purpurConfig.phantomBurnInLight > 0 && level.getMaxLocalRawBrightness(blockPosition()) >= level.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur this.setSecondsOnFire(8); }