apply feature patches

This commit is contained in:
granny
2025-03-25 21:54:45 -07:00
parent 48131f7f20
commit 9dc9fd34cd
20 changed files with 1316 additions and 1303 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms burn in light
diff --git a/net/minecraft/world/entity/monster/Phantom.java b/net/minecraft/world/entity/monster/Phantom.java
index aea7b608d88d243113f67665844841ac879c3f88..4cc1c8d8967b1e9ee5b0b1c50d887f3de3e8a882 100644
index 6c41a2cc9a772c216abfc2b241429ec712119bb4..eaa5f2db1bc6b01ef6a508cc5a60ff1e252c2360 100644
--- a/net/minecraft/world/entity/monster/Phantom.java
+++ b/net/minecraft/world/entity/monster/Phantom.java
@@ -53,6 +53,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -54,6 +54,7 @@ public class Phantom extends FlyingMob implements Enemy {
public java.util.UUID spawningEntity;
public boolean shouldBurnInDay = true;
// Paper end
@@ -16,7 +16,7 @@ index aea7b608d88d243113f67665844841ac879c3f88..4cc1c8d8967b1e9ee5b0b1c50d887f3d
public Phantom(EntityType<? extends Phantom> entityType, Level level) {
super(entityType, level);
@@ -253,7 +254,11 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -254,7 +255,11 @@ public class Phantom extends FlyingMob implements Enemy {
@Override
public void aiStep() {
@@ -29,7 +29,7 @@ index aea7b608d88d243113f67665844841ac879c3f88..4cc1c8d8967b1e9ee5b0b1c50d887f3d
if (getRider() == null || !this.isControllable()) // Purpur - Ridables
this.igniteForSeconds(8.0F);
}
@@ -374,6 +379,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -363,6 +368,7 @@ public class Phantom extends FlyingMob implements Enemy {
List<Player> nearbyPlayers = serverLevel.getNearbyPlayers(
this.attackTargeting, Phantom.this, Phantom.this.getBoundingBox().inflate(16.0, 64.0, 16.0)
);
@@ -37,7 +37,7 @@ index aea7b608d88d243113f67665844841ac879c3f88..4cc1c8d8967b1e9ee5b0b1c50d887f3d
if (!nearbyPlayers.isEmpty()) {
nearbyPlayers.sort(Comparator.<Player, Double>comparing(Entity::getY).reversed());
@@ -739,6 +745,12 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -732,6 +738,12 @@ public class Phantom extends FlyingMob implements Enemy {
return false;
} else if (!target.isAlive()) {
return false;