2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: MeFisto94 <MeFisto94@users.noreply.github.com>
|
|
|
|
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
|
2021-06-23 08:07:59 +00:00
|
|
|
index 6b4163f5601a0961055c8451ec7ef2204938cf69..cd75f895b6818fbb7ed4b0ef3df873f264bb2d1b 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java
|
2021-06-15 02:59:31 +00:00
|
|
|
@@ -97,9 +97,15 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
|
2021-06-11 12:02:28 +00:00
|
|
|
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);
|
2021-06-23 08:07:59 +00:00
|
|
|
@@ -223,7 +229,20 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo
|
2021-06-15 02:59:31 +00:00
|
|
|
public void readAdditionalSaveData(CompoundTag nbt) {
|
|
|
|
super.readAdditionalSaveData(nbt);
|
2021-06-11 12:02:28 +00:00
|
|
|
this.reassessWeaponGoal();
|
2021-06-23 08:07:59 +00:00
|
|
|
+ // Paper start
|
|
|
|
+ if (nbt.contains("Paper.ShouldBurnInDay")) {
|
|
|
|
+ this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
2021-06-15 02:59:31 +00:00
|
|
|
+ public void addAdditionalSaveData(CompoundTag nbt) {
|
|
|
|
+ super.addAdditionalSaveData(nbt);
|
|
|
|
+ nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay);
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
+ // 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
|
2021-10-05 03:14:11 +00:00
|
|
|
index 53cb932d5af963c51b026440da49bdc402cae9fd..253fce256341d20ee58f9b7afa1ffaa8fb820028 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
|
2021-06-15 02:59:31 +00:00
|
|
|
@@ -145,7 +145,7 @@ public class Phantom extends FlyingMob implements Enemy {
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void aiStep() {
|
|
|
|
- if (this.isAlive() && this.isSunBurnTick()) {
|
|
|
|
+ if (this.isAlive() && shouldBurnInDay && this.isSunBurnTick()) { // Paper - Configurable Burning
|
|
|
|
this.setSecondsOnFire(8);
|
|
|
|
}
|
|
|
|
|
2021-06-23 08:07:59 +00:00
|
|
|
@@ -176,6 +176,9 @@ public class Phantom extends FlyingMob implements Enemy {
|
2021-06-15 02:59:31 +00:00
|
|
|
if (nbt.hasUUID("Paper.SpawningEntity")) {
|
|
|
|
this.spawningEntity = nbt.getUUID("Paper.SpawningEntity");
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
2021-06-23 08:07:59 +00:00
|
|
|
+ if (nbt.contains("Paper.ShouldBurnInDay")) {
|
|
|
|
+ this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
|
|
|
|
+ }
|
2021-06-11 12:02:28 +00:00
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
|
2021-06-23 08:07:59 +00:00
|
|
|
@@ -190,6 +193,7 @@ public class Phantom extends FlyingMob implements Enemy {
|
2021-06-11 12:02:28 +00:00
|
|
|
if (this.spawningEntity != null) {
|
2021-06-17 21:39:36 +00:00
|
|
|
nbt.putUUID("Paper.SpawningEntity", this.spawningEntity);
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
2021-06-15 02:59:31 +00:00
|
|
|
+ nbt.putBoolean("Paper.ShouldBurnInDay", shouldBurnInDay);
|
2021-06-11 12:02:28 +00:00
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
|
2021-06-23 08:07:59 +00:00
|
|
|
@@ -249,6 +253,10 @@ public class Phantom extends FlyingMob implements Enemy {
|
2021-06-11 12:02:28 +00:00
|
|
|
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
|
2021-06-15 02:59:31 +00:00
|
|
|
private static enum AttackPhase {
|
2021-06-11 12:02:28 +00:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
2021-06-15 02:59:31 +00:00
|
|
|
index c9dab70b0b284fe1c1daafd3c1f5bd08b14fa35d..dce23f3878b1588c26b6116d80e597d08070edbc 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPhantom.java
|
2021-06-15 02:59:31 +00:00
|
|
|
@@ -40,5 +40,15 @@ public class CraftPhantom extends CraftFlying implements Phantom {
|
2021-06-11 12:02:28 +00:00
|
|
|
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
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
|
2021-07-18 07:41:53 +00:00
|
|
|
index 78f736ed3abaab4cc8bf8b7b163e25c806f79f3c..61e2841fea6603e3e5fbd004de7ffdfb79fc9981 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSkeleton.java
|
2021-07-06 03:48:08 +00:00
|
|
|
@@ -51,4 +51,16 @@ public class CraftSkeleton extends CraftAbstractSkeleton implements Skeleton {
|
2021-06-15 02:59:31 +00:00
|
|
|
public SkeletonType getSkeletonType() {
|
|
|
|
return SkeletonType.NORMAL;
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ // Paper start
|
|
|
|
+ @Override
|
|
|
|
+ public boolean shouldBurnInDay() {
|
|
|
|
+ return getHandle().shouldBurnInDay();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setShouldBurnInDay(boolean shouldBurnInDay) {
|
|
|
|
+ getHandle().setShouldBurnInDay(shouldBurnInDay);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
}
|