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 #868

Browse Source
This commit is contained in:
BillyGalbreath
2022-01-25 17:31:31 -06:00
parent d3c6faa749
commit 414cf7d035
6 changed files with 94 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0006-Ridables.patch
View File

@@ -3694,7 +3694,7 @@ index 2ffe85ee5565bcae56b8a64567c34eeed71e4e4b..d111d6afb7c0937e48f7d212dec5f2d4
@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 5c35b73c13c3826be9705e05154076810a78d147..60aab3964ebd180b52b57fba0705a63445a349bc 100644
index 5c35b73c13c3826be9705e05154076810a78d147..28660b9e8ead72638fea3f9adf8cd95cbc820170 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,64 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -3774,16 +3774,15 @@ index 5c35b73c13c3826be9705e05154076810a78d147..60aab3964ebd180b52b57fba0705a634
this.targetSelector.addGoal(1, new Phantom.PhantomAttackPlayerTargetGoal());
}
@@ -144,7 +204,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -145,6 +205,7 @@ public class Phantom extends FlyingMob implements Enemy {
@Override
public void aiStep() {
- if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
+ if (this.isAlive() && (getRider() == null || !this.isControllable()) && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning // Purpur
if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
+ if (getRider() == null || !this.isControllable()) // Purpur
this.setSecondsOnFire(8);
}
@@ -264,7 +324,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -264,7 +325,7 @@ public class Phantom extends FlyingMob implements Enemy {
private AttackPhase() {}
}
@@ -3792,7 +3791,7 @@ index 5c35b73c13c3826be9705e05154076810a78d147..60aab3964ebd180b52b57fba0705a634
private float speed = 0.1F;
@@ -272,8 +332,19 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -272,8 +333,19 @@ public class Phantom extends FlyingMob implements Enemy {
super(entity);
}
@@ -3813,7 +3812,7 @@ index 5c35b73c13c3826be9705e05154076810a78d147..60aab3964ebd180b52b57fba0705a634
if (Phantom.this.horizontalCollision) {
Phantom.this.setYRot(Phantom.this.getYRot() + 180.0F);
this.speed = 0.1F;
@@ -319,14 +390,20 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -319,14 +391,20 @@ public class Phantom extends FlyingMob implements Enemy {
}
}