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

4
patches/server/0090-Phantoms-burn-in-light.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantoms burn in light
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 e20b26ae0435c593218541eba6c68ef297fea7c8..d19567abb1844295764e6289ca19602809a9b37a 100644
index e20b26ae0435c593218541eba6c68ef297fea7c8..8864c055940b182518a8e17180e2c1d27849b3ff 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
@@ -18,6 +18,7 @@ import net.minecraft.sounds.SoundEffect;
@@ -37,7 +37,7 @@ index e20b26ae0435c593218541eba6c68ef297fea7c8..d19567abb1844295764e6289ca196028
@Override
public void movementTick() {
- if (this.isAlive() && shouldBurnInDay && this.eG()) { // Paper - Configurable Burning
+ 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() && ((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);
}

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);
}

2
patches/server/0150-Configurable-entity-base-attributes.patch
View File

@@ -905,7 +905,7 @@ index 15ed51a2746c09538a425fce25fa25f2619b7033..626a207cdb727866cb75f4e53a688086
public static AttributeProvider.Builder m() {
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 7e5f86a53c3a9efd4bb433f2fe1660a211c74049..a9ab31a538033f1dec39820d88ac13daa1a1c952 100644
index 851dc37d96d11f3f64b4eb373344e0c11a356540..5320368305f46399d63e2585d3411ff8c45582ad 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
@@ -120,6 +120,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {

2
patches/server/0151-Phantom-flames-on-swoop.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Phantom flames on swoop
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 a9ab31a538033f1dec39820d88ac13daa1a1c952..b91168309d948d801d7f4e85e14ac28289b0c934 100644
index 5320368305f46399d63e2585d3411ff8c45582ad..f6e09812b2c39f70d23100e73dce59fd5c1caa43 100644
--- a/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
+++ b/src/main/java/net/minecraft/world/entity/monster/EntityPhantom.java
@@ -226,6 +226,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {