mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
35 lines
1.6 KiB
Diff
35 lines
1.6 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/PiglinAbstract.java b/src/main/java/org/bukkit/entity/PiglinAbstract.java
|
|
index 87f4b7ad7c0a95a7123d142fa023c5da5c760341..70a45e657c6cab6058d1a56fc51c5df79fdce60f 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 {@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 or {@link #isImmuneToZombification()} is true or
|
|
+ * has no AI.
|
|
*
|
|
- * 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);
|
|
|