PaperMC/patches/api/0336-Fix-issues-with-mob-conversion.patch
Jake Potrebic 51cfcc88da
Updated Upstream (Bukkit/CraftBukkit) (#8740)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
d352d965 SPIGOT-7221: Add Enemy (Entity) interface

CraftBukkit Changes:
397c5557c SPIGOT-7221: Add Enemy (Entity) interface
a0d3dfaf2 PR-1129: Fix state corruption while handling explosion damage on EntityComplexPart
d67777f8b SPIGOT-7218: Player's outer layer of skin disappears after respawn
2023-01-01 12:17:40 -08:00

61 lines
3 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sun, 24 Oct 2021 20:29:27 -0700
Subject: [PATCH] Fix issues with mob conversion
diff --git a/src/main/java/org/bukkit/entity/Hoglin.java b/src/main/java/org/bukkit/entity/Hoglin.java
index 83a9e06fe91bdfe74e771b170966c70e4c47893c..452a8e73fa084f29f3b96793d642bd8ec0bc8aac 100644
--- a/src/main/java/org/bukkit/entity/Hoglin.java
+++ b/src/main/java/org/bukkit/entity/Hoglin.java
@@ -44,13 +44,17 @@ public interface Hoglin extends Animals, Enemy {
public int getConversionTime();
/**
- * Sets the amount of ticks until this entity will be converted to a Zoglin.
+ * Sets the conversion counter value. The counter is incremented
+ * every tick the method {@link #isConverting()} returns true. Setting
+ * this value will not start the conversion if the {@link Hoglin} is
+ * not in a valid environment ({@link org.bukkit.World#isPiglinSafe})
+ * to convert, is immune to zombification ({@link #isImmuneToZombification()})
+ * or has no AI ({@link #hasAI}).
*
- * When this reaches 0, the entity will be converted. A value of less than 0
- * will stop the current conversion process without converting the current
- * entity.
+ * When this reaches 300, the entity will be converted. To stop the
+ * conversion use {@link #setImmuneToZombification(boolean)}.
*
- * @param time new conversion time
+ * @param time new conversion counter
*/
public void setConversionTime(int time);
diff --git a/src/main/java/org/bukkit/entity/PiglinAbstract.java b/src/main/java/org/bukkit/entity/PiglinAbstract.java
index 87f4b7ad7c0a95a7123d142fa023c5da5c760341..eb2d6db81525d807d42b4c864d1340616424e6d9 100644
--- a/src/main/java/org/bukkit/entity/PiglinAbstract.java
+++ b/src/main/java/org/bukkit/entity/PiglinAbstract.java
@@ -31,14 +31,17 @@ public interface PiglinAbstract extends Monster, Ageable {
public int getConversionTime();
/**
- * Sets the amount of ticks until this entity will be converted to a
- * Zombified Piglin.
+ * Sets the conversion counter value. The counter is incremented
+ * every tick the method {@link #isConverting()} returns true. Setting
+ * this value will not start the conversion if the {@link PiglinAbstract} is
+ * not in a valid environment ({@link org.bukkit.World#isPiglinSafe})
+ * to convert, is immune to zombification ({@link #isImmuneToZombification()})
+ * or has no AI ({@link #hasAI}).
*
- * When this reaches 0, the entity will be converted. A value of less than 0
- * will stop the current conversion process without converting the current
- * entity.
+ * When this reaches 300, the entity will be converted. To stop the
+ * conversion use {@link #setImmuneToZombification(boolean)}.
*
- * @param time new conversion time
+ * @param time new conversion counter
*/
public void setConversionTime(int time);