mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-01 00:10:32 +01:00
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
62 lines
3.0 KiB
Diff
62 lines
3.0 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);
|
|
|