we compile

This commit is contained in:
Ben Kerllenevich
2023-06-09 09:57:52 -04:00
parent 589c34e018
commit 71c445017d
22 changed files with 110 additions and 98 deletions

View File

@@ -212,7 +212,7 @@ index 31706620960f5f153565f3cf64e32d0f4d10feb8..1df39e11d4fe3146fba9a0605c623384
@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 0894335fd9057184bb4f3ba5765ceec9d02828f7..85026b498f25c38653bf3b52061497419c9512d0 100644
index 7c9f6076f68de295e882e69137ac573db8d9698b..8605dfe152a09f31492226b1eb2a5eb39db9fcbc 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 {
@@ -223,7 +223,7 @@ index 0894335fd9057184bb4f3ba5765ceec9d02828f7..85026b498f25c38653bf3b5206149741
}
// Purpur start
@@ -254,16 +255,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -253,16 +254,7 @@ public class Phantom extends FlyingMob implements Enemy {
@Override
public void aiStep() {
@@ -241,7 +241,7 @@ index 0894335fd9057184bb4f3ba5765ceec9d02828f7..85026b498f25c38653bf3b5206149741
super.aiStep();
}
@@ -291,7 +283,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -290,7 +282,7 @@ public class Phantom extends FlyingMob implements Enemy {
if (nbt.hasUUID("Paper.SpawningEntity")) {
this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
}
@@ -250,7 +250,7 @@ index 0894335fd9057184bb4f3ba5765ceec9d02828f7..85026b498f25c38653bf3b5206149741
this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
}
// Paper end
@@ -308,7 +300,7 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -307,7 +299,7 @@ public class Phantom extends FlyingMob implements Enemy {
if (this.spawningEntity != null) {
nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
}
@@ -259,7 +259,7 @@ index 0894335fd9057184bb4f3ba5765ceec9d02828f7..85026b498f25c38653bf3b5206149741
// Paper end
}
@@ -374,8 +366,14 @@ public class Phantom extends FlyingMob implements Enemy {
@@ -373,8 +365,14 @@ public class Phantom extends FlyingMob implements Enemy {
}
public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
@@ -269,7 +269,7 @@ index 0894335fd9057184bb4f3ba5765ceec9d02828f7..85026b498f25c38653bf3b5206149741
+ // Purpur start
+ public boolean shouldBurnInDay() {
+ boolean burnFromDaylight = this.shouldBurnInDay && this.level().purpurConfig.phantomBurnInDaylight;
+ boolean burnFromLightSource = this.level().purpurConfig.phantomBurnInLight > 0 && this.level.getMaxLocalRawBrightness(blockPosition()) >= this.level().purpurConfig.phantomBurnInLight;
+ boolean burnFromLightSource = this.level().purpurConfig.phantomBurnInLight > 0 && this.level().getMaxLocalRawBrightness(blockPosition()) >= this.level().purpurConfig.phantomBurnInLight;
+ return burnFromDaylight || burnFromLightSource;
+ }
+ // Purpur End