Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
62 Zeilen
3.0 KiB
Diff
62 Zeilen
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);
|
|
|