Paper/patches/server/0295-Add-more-Zombie-API.patch

116 lines
4.1 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Oct 2018 04:29:59 -0500
Subject: [PATCH] Add more Zombie API
diff --git a/src/main/java/net/minecraft/world/entity/monster/Zombie.java b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
2021-11-24 01:44:41 +01:00
index 42f3f632caba1897b762a6897923585901a63bd1..8c7c621f09e8669a6874a2ce101972cb1c03f8ae 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/entity/monster/Zombie.java
+++ b/src/main/java/net/minecraft/world/entity/monster/Zombie.java
2021-11-24 01:44:41 +01:00
@@ -93,6 +93,7 @@ public class Zombie extends Monster {
2021-06-11 14:02:28 +02:00
private int inWaterTime;
public int conversionTime;
private int lastTick = MinecraftServer.currentTick; // CraftBukkit - add field
+ private boolean shouldBurnInDay = true; // Paper
public Zombie(EntityType<? extends Zombie> type, Level world) {
super(type, world);
2021-11-24 01:44:41 +01:00
@@ -261,6 +262,12 @@ public class Zombie extends Monster {
2021-06-11 14:02:28 +02:00
super.aiStep();
}
+ // Paper start
+ public void stopDrowning() {
+ this.conversionTime = -1;
+ this.getEntityData().set(Zombie.DATA_DROWNED_CONVERSION_ID, false);
+ }
+ // Paper end
public void startUnderWaterConversion(int ticksUntilWaterConversion) {
this.lastTick = MinecraftServer.currentTick; // CraftBukkit
this.conversionTime = ticksUntilWaterConversion;
2021-11-24 01:44:41 +01:00
@@ -290,9 +297,15 @@ public class Zombie extends Monster {
2021-06-11 14:02:28 +02:00
}
2021-06-16 00:24:12 +02:00
public boolean isSunSensitive() {
2021-06-11 14:02:28 +02:00
- return true;
+ return this.shouldBurnInDay; // Paper - use api value instead
2021-06-13 10:26:58 +02:00
}
2021-06-11 14:02:28 +02:00
+ // Paper start
+ public void setShouldBurnInDay(boolean shouldBurnInDay) {
+ this.shouldBurnInDay = shouldBurnInDay;
2021-06-13 10:26:58 +02:00
+ }
2021-06-11 14:02:28 +02:00
+ // Paper end
2021-06-13 10:26:58 +02:00
+
2021-06-11 14:02:28 +02:00
@Override
public boolean hurt(DamageSource source, float amount) {
2021-06-13 10:26:58 +02:00
if (!super.hurt(source, amount)) {
2021-11-24 01:44:41 +01:00
@@ -412,6 +425,7 @@ public class Zombie extends Monster {
2021-06-13 10:26:58 +02:00
nbt.putBoolean("CanBreakDoors", this.canBreakDoors());
nbt.putInt("InWaterTime", this.isInWater() ? this.inWaterTime : -1);
nbt.putInt("DrownedConversionTime", this.isUnderWaterConverting() ? this.conversionTime : -1);
+ nbt.putBoolean("Paper.ShouldBurnInDay", this.shouldBurnInDay); // Paper
2021-06-11 14:02:28 +02:00
}
@Override
2021-11-24 01:44:41 +01:00
@@ -423,6 +437,11 @@ public class Zombie extends Monster {
2021-06-13 10:26:58 +02:00
if (nbt.contains("DrownedConversionTime", 99) && nbt.getInt("DrownedConversionTime") > -1) {
this.startUnderWaterConversion(nbt.getInt("DrownedConversionTime"));
2021-06-11 14:02:28 +02:00
}
+ // Paper start
2021-06-13 10:26:58 +02:00
+ if (nbt.contains("Paper.ShouldBurnInDay")) {
+ this.shouldBurnInDay = nbt.getBoolean("Paper.ShouldBurnInDay");
2021-06-11 14:02:28 +02:00
+ }
+ // Paper end
2021-06-13 10:26:58 +02:00
2021-06-11 14:02:28 +02:00
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
2021-06-16 00:24:12 +02:00
index 2e643e92569512ac4e75c0ef2ee7aa4b688e7356..77e4875484bdaedfba576a6b008245c488b2a112 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
@@ -93,6 +93,42 @@ public class CraftZombie extends CraftMonster implements Zombie {
@Override
public void setAgeLock(boolean b) {
}
+ // Paper start
+ @Override
+ public boolean isDrowning() {
+ return getHandle().isUnderWaterConverting();
+ }
+
+ @Override
+ public void startDrowning(int drownedConversionTime) {
+ getHandle().startUnderWaterConversion(drownedConversionTime);
+ }
+
+ @Override
+ public void stopDrowning() {
+ getHandle().stopDrowning();
+ }
+
+ @Override
+ public boolean shouldBurnInDay() {
2021-06-16 00:24:12 +02:00
+ return getHandle().isSunSensitive();
2021-06-11 14:02:28 +02:00
+ }
+
+ @Override
+ public boolean isArmsRaised() {
+ return getHandle().isAggressive();
+ }
+
+ @Override
+ public void setArmsRaised(final boolean raised) {
+ getHandle().setAggressive(raised);
+ }
+
+ @Override
+ public void setShouldBurnInDay(boolean shouldBurnInDay) {
+ getHandle().setShouldBurnInDay(shouldBurnInDay);
+ }
+ // Paper end
@Override
public boolean getAgeLock() {