mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 18:31:29 +01:00
2fa8efce9b
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: 82af5dc6 SPIGOT-7396: Add PlayerSignOpenEvent 3f0281ca SPIGOT-7063, PR-763: Add DragonBattle#initiateRespawn with custom EnderCrystals f83c8df4 PR-873: Add PlayerRecipeBookClickEvent 14560d39 SPIGOT-7435: Add TeleportCause#EXIT_BED 2cc6db92 SPIGOT-7422, PR-887: Add API to set sherds on decorated pots 36022f02 PR-883: Add ItemFactory#getSpawnEgg 12eb5c46 PR-881: Update Scoreboard Javadocs, remove explicit exception throwing f6d8d44a PR-882: Add modern time API methods to ban API 21a7b710 Upgrade some Maven plugins to reduce warnings 11fd1225 PR-886: Deprecate the SmithingRecipe constructor as it now does nothing dbd1761d SPIGOT-7406: Improve documentation for getDragonBattle CraftBukkit Changes: d548daac2 SPIGOT-7446: BlockState#update not updating a spawner's type to null 70e0bc050 SPIGOT-7447: Fix --forceUpgrade 6752f1d63 SPIGOT-7396: Add PlayerSignOpenEvent 847b4cad5 SPIGOT-7063, PR-1071: Add DragonBattle#initiateRespawn with custom EnderCrystals c335a555f PR-1212: Add PlayerRecipeBookClickEvent 4be756ecb SPIGOT-7445: Fix opening smithing inventory db70bd6ed SPIGOT-7441: Fix issue placing certain items in creative/op f7fa6d993 SPIGOT-7435: Add TeleportCause#EXIT_BED b435e8e8d SPIGOT-7349: Player#setDisplayName not working when message/format unmodified a2fafdd1d PR-1232: Re-add fix for player rotation 7cf863de1 PR-1233: Remove some old MC bug fixes now fixed in vanilla 08ec344ad Fix ChunkGenerator#generateCaves never being called 5daeb502a SPIGOT-7422, PR-1228: Add API to set sherds on decorated pots 52faa6b32 PR-1224: Add ItemFactory#getSpawnEgg 01cae71b7 SPIGOT-7429: Fix LEFT_CLICK_AIR not working for passable entities and spectators a94277a18 PR-1223: Remove non-existent scoreboard display name/prefix/suffix limits 36b107660 PR-1225: Add modern time API methods to ban API 59ead25bc Upgrade some Maven plugins to reduce warnings 202fc5c4e Increase outdated build delay ce545de57 SPIGOT-7398: TextDisplay#setInterpolationDuration incorrectly updates the line width Spigot Changes: b41c46db Rebuild patches 3374045a SPIGOT-7431: Fix EntityMountEvent returning opposite entities 0ca4eb66 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);
|
|
|