aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2023-09-23 09:38:10 +1000
committerNassim Jahnke <[email protected]>2023-09-23 09:38:10 +1000
commitb3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb (patch)
tree429b9bd9ef2cc19e42b8656ef25ca1548f5efe88 /patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
parent81c5901c674e6ee89dbfed4848c9eb645bfb0f16 (diff)
downloadPaper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.tar.gz
Paper-b3ec8bd8ae19e40022ad4dd5db4a1414cb4330bb.zip
Revert "re-add distance map patch"
This reverts commit 81c5901c674e6ee89dbfed4848c9eb645bfb0f16.
Diffstat (limited to 'patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch')
-rw-r--r--patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch131
1 files changed, 0 insertions, 131 deletions
diff --git a/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
deleted file mode 100644
index 33c6b6d97f..0000000000
--- a/patches/server/0594-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MeFisto94 <[email protected]>
-Date: Tue, 11 May 2021 00:48:33 +0200
-Subject: [PATCH] Add a "should burn in sunlight" API for Phantoms and
- Skeletons
-
-
-diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-index 6be9e8d693bbb084791d7b30a1891ddb803d6b02..8e9469fec42f7b6a132cf173f6f5a95777a29b3b 100644
---- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
-@@ -98,9 +98,15 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
- return MobType.UNDEAD;
- }
-
-+ // Paper start
-+ private boolean shouldBurnInDay = true;
-+ public boolean shouldBurnInDay() { return shouldBurnInDay; }
-+ public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
-+ // Paper end
-+
- @Override
- public void aiStep() {
-- boolean flag = this.isSunBurnTick();
-+ boolean flag = shouldBurnInDay && this.isSunBurnTick(); // Paper - Configurable Burning
-
- if (flag) {
- ItemStack itemstack = this.getItemBySlot(EquipmentSlot.HEAD);
-@@ -228,7 +234,20 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
- public void readAdditionalSaveData(CompoundTag nbt) {
- super.readAdditionalSaveData(nbt);
- this.reassessWeaponGoal();
-+ // Paper start
-+ if (nbt.contains("Paper.ShouldBurnInDay")) {
-+ this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
-+ }
-+ // Paper end
-+ }
-+
-+ // Paper start
-+ @Override
-+ public void addAdditionalSaveData(CompoundTag nbt) {
-+ super.addAdditionalSaveData(nbt);
-+ nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay);
- }
-+ // Paper end
-
- @Override
- public void setItemSlot(EquipmentSlot slot, ItemStack stack) {
-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 a40852acf5d175cc3a06bc17fb021c76f0c11a28..5b4719dd7c3b8f93c898779f45239568f6a5fe43 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-@@ -145,7 +145,7 @@ public class Phantom extends FlyingMob implements Enemy {
-
- @Override
- public void aiStep() {
-- if (this.isAlive() && this.isSunBurnTick()) {
-+ if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
- this.setSecondsOnFire(8);
- }
-
-@@ -176,6 +176,9 @@ public class Phantom extends FlyingMob implements Enemy {
- if (nbt.hasUUID("Paper.SpawningEntity")) {
- this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
- }
-+ if (nbt.contains("Paper.ShouldBurnInDay")) {
-+ this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
-+ }
- // Paper end
- }
-
-@@ -190,6 +193,7 @@ public class Phantom extends FlyingMob implements Enemy {
- if (this.spawningEntity != null) {
- nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
- }
-+ nbt.putBoolean("Paper.ShouldBurnInDay", shouldBurnInDay);
- // Paper end
- }
-
-@@ -258,6 +262,10 @@ public class Phantom extends FlyingMob implements Enemy {
- return spawningEntity;
- }
- public void setSpawningEntity(java.util.UUID entity) { this.spawningEntity = entity; }
-+
-+ private boolean shouldBurnInDay = true;
-+ public boolean shouldBurnInDay() { return shouldBurnInDay; }
-+ public void setShouldBurnInDay(boolean shouldBurnInDay) { this.shouldBurnInDay = shouldBurnInDay; }
- // Paper end
- private static enum AttackPhase {
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-index 5ff566186431440c25a26900aba14e4adb642031..5beaa2bb0d58fe477ce8d2de8b77600d3b416d8c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractSkeleton.java
-@@ -20,4 +20,15 @@ public abstract class CraftAbstractSkeleton extends CraftMonster implements Abst
- return (net.minecraft.world.entity.monster.AbstractSkeleton) super.getHandle();
- }
- // Paper end
-+ // Paper start
-+ @Override
-+ public boolean shouldBurnInDay() {
-+ return getHandle().shouldBurnInDay();
-+ }
-+
-+ @Override
-+ public void setShouldBurnInDay(boolean shouldBurnInDay) {
-+ getHandle().setShouldBurnInDay(shouldBurnInDay);
-+ }
-+ // Paper end
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-index 305a635b049741ac5e2670060c6818cb2c07e5ab..9304e201db1ec96d0916aa8ea781f3e4bc7991e6 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
-@@ -34,5 +34,15 @@ public class CraftPhantom extends CraftFlying implements Phantom, CraftEnemy {
- public java.util.UUID getSpawningEntity() {
- return getHandle().getSpawningEntity();
- }
-+
-+ @Override
-+ public boolean shouldBurnInDay() {
-+ return getHandle().shouldBurnInDay();
-+ }
-+
-+ @Override
-+ public void setShouldBurnInDay(boolean shouldBurnInDay) {
-+ getHandle().setShouldBurnInDay(shouldBurnInDay);
-+ }
- // Paper end
- }