2021-11-06 01:06:19 +01:00
|
|
|
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
|
|
|
|
|
|
|
|
|
2022-12-30 21:08:02 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Hoglin.java b/src/main/java/org/bukkit/entity/Hoglin.java
|
2023-01-01 21:17:40 +01:00
|
|
|
index 83a9e06fe91bdfe74e771b170966c70e4c47893c..452a8e73fa084f29f3b96793d642bd8ec0bc8aac 100644
|
2022-12-30 21:08:02 +01:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Hoglin.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Hoglin.java
|
2023-01-01 21:17:40 +01:00
|
|
|
@@ -44,13 +44,17 @@ public interface Hoglin extends Animals, Enemy {
|
2022-12-30 21:08:02 +01:00
|
|
|
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);
|
|
|
|
|
2021-11-06 01:06:19 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/PiglinAbstract.java b/src/main/java/org/bukkit/entity/PiglinAbstract.java
|
2022-12-30 21:08:02 +01:00
|
|
|
index 87f4b7ad7c0a95a7123d142fa023c5da5c760341..eb2d6db81525d807d42b4c864d1340616424e6d9 100644
|
2021-11-06 01:06:19 +01:00
|
|
|
--- 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
|
2022-12-30 21:08:02 +01:00
|
|
|
+ * every tick the method {@link #isConverting()} returns true. Setting
|
|
|
|
+ * this value will not start the conversion if the {@link PiglinAbstract} is
|
2021-11-06 01:06:19 +01:00
|
|
|
+ * not in a valid environment ({@link org.bukkit.World#isPiglinSafe})
|
2022-12-30 21:08:02 +01:00
|
|
|
+ * to convert, is immune to zombification ({@link #isImmuneToZombification()})
|
|
|
|
+ * or has no AI ({@link #hasAI}).
|
2021-11-06 01:06:19 +01:00
|
|
|
*
|
|
|
|
- * 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);
|
|
|
|
|