Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #338 - Phantoms always burning bug

Browse Source
This commit is contained in:
BillyGalbreath
2021-05-16 20:26:54 -05:00
parent 8fa99b34fb
commit bb9d72d1f4
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0103-Ridables.patch
View File

@@ -4229,7 +4229,7 @@ index fe80e93b00f3bb2f297c6528c3951313fa3c08c7..15ed51a2746c09538a425fce25fa25f2
@Override
diff --git a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
index d19567abb1844295764e6289ca19602809a9b37a..7e5f86a53c3a9efd4bb433f2fe1660a211c74049 100644
index 8864c055940b182518a8e17180e2c1d27849b3ff..851dc37d96d11f3f64b4eb373344e0c11a356540 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
@@ -13,6 +13,7 @@ import net.minecraft.network.syncher.DataWatcher;
@@ -4334,8 +4334,8 @@ index d19567abb1844295764e6289ca19602809a9b37a..7e5f86a53c3a9efd4bb433f2fe1660a2
@Override
public void movementTick() {
- if (this.isAlive() && ((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Purpur
+ if (this.isAlive() && !hasPurpurRider() && ((shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight && this.isInDaylight()) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Purpur
- if (this.isAlive() && ((this.isInDaylight() && (shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight)) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
+ if (this.isAlive() && !hasPurpurRider() && ((this.isInDaylight() && (shouldBurnInDay || world.purpurConfig.phantomBurnInDaylight)) || (world.purpurConfig.phantomBurnInLight > 0 && world.getLightLevel(new BlockPosition(this)) >= world.purpurConfig.phantomBurnInLight))) { // Paper - Configurable Burning // Purpur
this.setOnFire(8);
}