Paper/nms-patches/TileEntityBeacon.patch

158 lines
5.5 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/TileEntityBeacon.java
+++ b/net/minecraft/server/TileEntityBeacon.java
2016-11-17 02:41:03 +01:00
@@ -9,6 +9,13 @@
2018-07-15 02:00:00 +02:00
import java.util.stream.Collectors;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
+// CraftBukkit start
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
2016-07-18 09:40:07 +02:00
+import org.bukkit.craftbukkit.potion.CraftPotionUtil;
+import org.bukkit.entity.HumanEntity;
2016-07-18 09:40:07 +02:00
+import org.bukkit.potion.PotionEffect;
+// CraftBukkit end
+
2018-07-15 02:00:00 +02:00
public class TileEntityBeacon extends TileEntityContainer implements IWorldInventory, ITickable {
2016-02-29 22:32:46 +01:00
public static final MobEffectList[][] a = new MobEffectList[][] { { MobEffects.FASTER_MOVEMENT, MobEffects.FASTER_DIG}, { MobEffects.RESISTANCE, MobEffects.JUMP}, { MobEffects.INCREASE_DAMAGE}, { MobEffects.REGENERATION}};
2018-07-15 02:00:00 +02:00
@@ -23,6 +30,38 @@
2016-11-17 02:41:03 +01:00
public MobEffectList secondaryEffect;
private ItemStack inventorySlot;
2018-07-15 02:00:00 +02:00
private IChatBaseComponent o;
+ // CraftBukkit start - add fields and methods
+ public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
+ private int maxStack = MAX_STACK;
+
2016-11-17 02:41:03 +01:00
+ public List<ItemStack> getContents() {
+ return Arrays.asList(this.inventorySlot);
+ }
+
+ public void onOpen(CraftHumanEntity who) {
+ transaction.add(who);
+ }
+
+ public void onClose(CraftHumanEntity who) {
+ transaction.remove(who);
+ }
+
+ public List<HumanEntity> getViewers() {
+ return transaction;
+ }
+
+ public void setMaxStackSize(int size) {
+ maxStack = size;
+ }
2016-07-18 09:40:07 +02:00
+
+ public PotionEffect getPrimaryEffect() {
2016-11-17 02:41:03 +01:00
+ return (this.primaryEffect != null) ? CraftPotionUtil.toBukkit(new MobEffect(this.primaryEffect, getLevel(), getAmplification(), true, true)) : null;
2016-07-18 09:40:07 +02:00
+ }
+
+ public PotionEffect getSecondaryEffect() {
2016-11-17 02:41:03 +01:00
+ return (hasSecondaryEffect()) ? CraftPotionUtil.toBukkit(new MobEffect(this.secondaryEffect, getLevel(), getAmplification(), true, true)) : null;
2016-07-18 09:40:07 +02:00
+ }
+ // CraftBukkit end
2016-11-17 02:41:03 +01:00
public TileEntityBeacon() {
2018-08-26 04:00:00 +02:00
super(TileEntityTypes.BEACON);
2018-07-15 02:00:00 +02:00
@@ -56,41 +95,79 @@
this.world.a((EntityHuman) null, this.position, soundeffect, SoundCategory.BLOCKS, 1.0F, 1.0F);
2016-07-18 09:40:07 +02:00
}
2018-07-15 02:00:00 +02:00
- private void D() {
- if (this.i && this.levels > 0 && !this.world.isClientSide && this.primaryEffect != null) {
2016-11-17 02:41:03 +01:00
- double d0 = (double) (this.levels * 10 + 10);
2016-07-18 09:40:07 +02:00
+ // CraftBukkit start - split into components
+ private byte getAmplification() {
+ {
byte b0 = 0;
2016-11-17 02:41:03 +01:00
if (this.levels >= 4 && this.primaryEffect == this.secondaryEffect) {
2016-07-18 09:40:07 +02:00
b0 = 1;
}
+ return b0;
+ }
+ }
+
+ private int getLevel() {
+ {
2016-11-17 02:41:03 +01:00
int i = (9 + this.levels * 2) * 20;
2016-07-18 09:40:07 +02:00
+ return i;
+ }
+ }
+
+ public List getHumansInRange() {
+ {
2016-11-17 02:41:03 +01:00
+ double d0 = (double) (this.levels * 10 + 10);
2016-07-18 09:40:07 +02:00
+
int j = this.position.getX();
int k = this.position.getY();
int l = this.position.getZ();
2016-11-17 02:41:03 +01:00
AxisAlignedBB axisalignedbb = (new AxisAlignedBB((double) j, (double) k, (double) l, (double) (j + 1), (double) (k + 1), (double) (l + 1))).g(d0).b(0.0D, (double) this.world.getHeight(), 0.0D);
2016-07-18 09:40:07 +02:00
List list = this.world.a(EntityHuman.class, axisalignedbb);
+
+ return list;
+ }
+ }
+
+ private void applyEffect(List list, MobEffectList effects, int i, int b0) {
+ {
Iterator iterator = list.iterator();
EntityHuman entityhuman;
while (iterator.hasNext()) {
entityhuman = (EntityHuman) iterator.next();
2016-11-17 02:41:03 +01:00
- entityhuman.addEffect(new MobEffect(this.primaryEffect, i, b0, true, true));
+ entityhuman.addEffect(new MobEffect(effects, i, b0, true, true), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.BEACON);
2016-07-18 09:40:07 +02:00
}
+ }
+ }
+ private boolean hasSecondaryEffect() {
+ {
2016-11-17 02:41:03 +01:00
if (this.levels >= 4 && this.primaryEffect != this.secondaryEffect && this.secondaryEffect != null) {
2016-07-18 09:40:07 +02:00
- iterator = list.iterator();
+ return true;
+ }
2017-10-13 12:47:55 +02:00
- while (iterator.hasNext()) {
- entityhuman = (EntityHuman) iterator.next();
- entityhuman.addEffect(new MobEffect(this.secondaryEffect, i, 0, true, true));
- }
2016-07-18 09:40:07 +02:00
+ return false;
+ }
+ }
+
2018-07-15 02:00:00 +02:00
+ private void D() {
+ if (this.i && this.levels > 0 && !this.world.isClientSide && this.primaryEffect != null) {
2016-07-18 09:40:07 +02:00
+ byte b0 = getAmplification();
+
+ int i = getLevel();
+ List list = getHumansInRange();
+
2016-11-17 02:41:03 +01:00
+ applyEffect(list, this.primaryEffect, i, b0);
2017-10-13 12:47:55 +02:00
+
2016-07-18 09:40:07 +02:00
+ if (hasSecondaryEffect()) {
2016-11-17 02:41:03 +01:00
+ applyEffect(list, this.secondaryEffect, i, 0);
2016-07-18 09:40:07 +02:00
}
}
}
+ // CraftBukkit end
2018-07-15 02:00:00 +02:00
private void E() {
2017-05-14 04:00:00 +02:00
int i = this.position.getX();
2018-07-15 02:00:00 +02:00
@@ -210,8 +287,10 @@
public void load(NBTTagCompound nbttagcompound) {
super.load(nbttagcompound);
2018-07-15 02:00:00 +02:00
- this.primaryEffect = e(nbttagcompound.getInt("Primary"));
- this.secondaryEffect = e(nbttagcompound.getInt("Secondary"));
+ // Craftbukkit start - persist manually set non-default beacon effects (SPIGOT-3598)
+ this.primaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Primary"));
+ this.secondaryEffect = MobEffectList.fromId(nbttagcompound.getInt("Secondary"));
+ // Craftbukkit end
this.levels = nbttagcompound.getInt("Levels");
}