3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 04:20:04 +01:00
Paper/patches/api/0459-Conduit-API.patch
Nassim Jahnke 71c84c8132
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
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
2024-02-23 14:37:33 +01:00

47 Zeilen
1.4 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tamion <70228790+notTamion@users.noreply.github.com>
Date: Sat, 27 Jan 2024 20:46:29 +0100
Subject: [PATCH] Conduit API
diff --git a/src/main/java/org/bukkit/block/Conduit.java b/src/main/java/org/bukkit/block/Conduit.java
index 5543165536e84503c2d1476ee2001468cbb724f9..b3eec2eab586072598a40375a1c3e722ee3fa352 100644
--- a/src/main/java/org/bukkit/block/Conduit.java
+++ b/src/main/java/org/bukkit/block/Conduit.java
@@ -3,4 +3,34 @@ package org.bukkit.block;
/**
* Represents a captured state of a conduit.
*/
-public interface Conduit extends TileState { }
+public interface Conduit extends TileState {
+
+ // Paper start - Conduit API
+
+ /**
+ * Gets if the conduit is currently active.
+ * <p>
+ * Requires the conduit to be placed in the world.
+ *
+ * @return if the conduit is active
+ */
+ boolean isActive();
+
+ /**
+ * Gets the range in which the Conduit Power effect gets added to players.
+ * <p>
+ * Requires the conduit to be placed in the world.
+ *
+ * @return the range
+ */
+ int getRange();
+
+ /**
+ * Gets the current target of the conduit.
+ *
+ * @return the current target
+ */
+ @org.jetbrains.annotations.Nullable
+ org.bukkit.entity.LivingEntity getTarget();
+ // Paper end - Conduit API
+}