mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
Add custom ranges to beacons
Adds 3 methods to the Beacon block state to set a custom range for the beacon. One to set the range, one to get the range, and one to reset the range (aka go back to using the default range-by-beacon-tier system).
This commit is contained in:
parent
867d1d5de7
commit
21e0ef27f1
2 changed files with 127 additions and 0 deletions
37
Spigot-API-Patches/Beacon-API-custom-effect-ranges.patch
Normal file
37
Spigot-API-Patches/Beacon-API-custom-effect-ranges.patch
Normal file
|
@ -0,0 +1,37 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Wed, 24 Jun 2020 12:38:15 -0600
|
||||
Subject: [PATCH] Beacon API - custom effect ranges
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/block/Beacon.java b/src/main/java/org/bukkit/block/Beacon.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/block/Beacon.java
|
||||
+++ b/src/main/java/org/bukkit/block/Beacon.java
|
||||
@@ -0,0 +0,0 @@ public interface Beacon extends TileState, Lockable, Nameable {
|
||||
* @param effect desired secondary effect
|
||||
*/
|
||||
void setSecondaryEffect(@Nullable PotionEffectType effect);
|
||||
+
|
||||
+ // Paper start - Custom effect ranges
|
||||
+ /**
|
||||
+ * Gets the effect range of this beacon.
|
||||
+ * A negative range value means the beacon is using its default range based on tier.
|
||||
+ * @return Either the custom range set with {@link #setEffectRange(double) or the range based on the beacon tier.
|
||||
+ */
|
||||
+ double getEffectRange();
|
||||
+
|
||||
+ /**
|
||||
+ * Sets the effect range of the beacon
|
||||
+ * A negative range value means the beacon is using its default range based on tier.
|
||||
+ * @param range Radius of effect range.
|
||||
+ */
|
||||
+ void setEffectRange(double range);
|
||||
+
|
||||
+ /**
|
||||
+ * Resets the custom range from this beacon and falls back to the range based on the the beacon tier.
|
||||
+ * Shortcut for setting the effect range to a negative number.
|
||||
+ */
|
||||
+ void resetEffectRange();
|
||||
+ // Paper end
|
||||
}
|
90
Spigot-Server-Patches/Beacon-API-custom-effect-ranges.patch
Normal file
90
Spigot-Server-Patches/Beacon-API-custom-effect-ranges.patch
Normal file
|
@ -0,0 +1,90 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Wed, 24 Jun 2020 12:39:08 -0600
|
||||
Subject: [PATCH] Beacon API - custom effect ranges
|
||||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
|
||||
+++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
|
||||
@@ -0,0 +0,0 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic
|
||||
return (hasSecondaryEffect()) ? CraftPotionUtil.toBukkit(new MobEffect(this.secondaryEffect, getLevel(), getAmplification(), true, true)) : null;
|
||||
}
|
||||
// CraftBukkit end
|
||||
+ // Paper start - add field/methods for custom range
|
||||
+ private final String PAPER_RANGE_TAG = "Paper.Range";
|
||||
+ private double effectRange = -1;
|
||||
+
|
||||
+ public double getEffectRange() {
|
||||
+ if (this.effectRange < 0) {
|
||||
+ return this.levels * 10 + 10;
|
||||
+ } else {
|
||||
+ return effectRange;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ public void setEffectRange(double range) {
|
||||
+ this.effectRange = range;
|
||||
+ }
|
||||
+
|
||||
+ public void resetEffectRange() {
|
||||
+ this.effectRange = -1;
|
||||
+ }
|
||||
+ // Paper end
|
||||
|
||||
public TileEntityBeacon() {
|
||||
super(TileEntityTypes.BEACON);
|
||||
@@ -0,0 +0,0 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic
|
||||
|
||||
public List getHumansInRange() {
|
||||
{
|
||||
- double d0 = (double) (this.levels * 10 + 10);
|
||||
+ // Paper - custom beacon ranges
|
||||
+ double d0 = this.getEffectRange();
|
||||
|
||||
AxisAlignedBB axisalignedbb = (new AxisAlignedBB(this.position)).g(d0).b(0.0D, (double) this.world.getBuildHeight(), 0.0D);
|
||||
List<EntityHuman> list = this.world.a(EntityHuman.class, axisalignedbb);
|
||||
@@ -0,0 +0,0 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic
|
||||
this.secondaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Secondary"));
|
||||
this.levels = nbttagcompound.getInt("Levels"); // SPIGOT-5053, use where available
|
||||
// CraftBukkit end
|
||||
+ // Paper
|
||||
+ this.effectRange = nbttagcompound.hasKeyOfType(PAPER_RANGE_TAG, 6) ? nbttagcompound.getDouble(PAPER_RANGE_TAG) : -1;
|
||||
+
|
||||
if (nbttagcompound.hasKeyOfType("CustomName", 8)) {
|
||||
this.customName = IChatBaseComponent.ChatSerializer.a(nbttagcompound.getString("CustomName"));
|
||||
}
|
||||
@@ -0,0 +0,0 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic
|
||||
if (this.customName != null) {
|
||||
nbttagcompound.setString("CustomName", IChatBaseComponent.ChatSerializer.a(this.customName));
|
||||
}
|
||||
+ // Paper
|
||||
+ nbttagcompound.setDouble(PAPER_RANGE_TAG, this.effectRange);
|
||||
|
||||
this.chestLock.a(nbttagcompound);
|
||||
return nbttagcompound;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
|
||||
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
|
||||
@@ -0,0 +0,0 @@ public class CraftBeacon extends CraftBlockEntityState<TileEntityBeacon> impleme
|
||||
public void setLock(String key) {
|
||||
this.getSnapshot().chestLock = (key == null) ? ChestLock.a : new ChestLock(key);
|
||||
}
|
||||
+
|
||||
+ @Override
|
||||
+ public double getEffectRange() {
|
||||
+ return this.getSnapshot().getEffectRange();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setEffectRange(double range) {
|
||||
+ this.getSnapshot().setEffectRange(range);
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void resetEffectRange() {
|
||||
+ this.getSnapshot().resetEffectRange();
|
||||
+ }
|
||||
}
|
Loading…
Reference in a new issue