diff --git a/patches/server/Conduit-API.patch b/patches/server/Conduit-API.patch deleted file mode 100644 index 5494878b89..0000000000 --- a/patches/server/Conduit-API.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tamion <70228790+notTamion@users.noreply.github.com> -Date: Sat, 27 Jan 2024 20:46:40 +0100 -Subject: [PATCH] Conduit API - -== AT == -public net.minecraft.world.level.block.entity.ConduitBlockEntity effectBlocks -public net.minecraft.world.level.block.entity.ConduitBlockEntity destroyTarget - -diff --git a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -+++ b/src/main/java/net/minecraft/world/level/block/entity/ConduitBlockEntity.java -@@ -0,0 +0,0 @@ public class ConduitBlockEntity extends BlockEntity { - public static int getRange(List<BlockPos> list) { - // CraftBukkit end - int i = list.size(); -- int j = i / 7 * 16; -+ int j = i / 7 * 16; // Paper - Conduit API; diff on change - // CraftBukkit start - return j; - } -diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftConduit.java -@@ -0,0 +0,0 @@ public class CraftConduit extends CraftBlockEntityState<ConduitBlockEntity> impl - AABB bounds = ConduitBlockEntity.getDestroyRangeAABB(this.getPosition()); - return new BoundingBox(bounds.minX, bounds.minY, bounds.minZ, bounds.maxX, bounds.maxY, bounds.maxZ); - } -+ -+ // Paper start - Conduit API -+ @Override -+ public boolean isActive() { -+ requirePlaced(); -+ return this.getTileEntity().isActive(); -+ } -+ -+ @Override -+ public int getRange() { -+ requirePlaced(); -+ return this.getTileEntity().effectBlocks.size() / 7 * 16; -+ } -+ -+ @Override -+ public org.bukkit.entity.LivingEntity getTarget() { -+ return this.getTileEntity().destroyTarget == null ? null : this.getTileEntity().destroyTarget.getBukkitLivingEntity(); -+ } -+ // Paper end - Conduit API - }