twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-31 12:23:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Enhance Beacon Block API

Browse Source
This commit is contained in:
md_5
2016-07-23 10:55:43 +10:00
parent 7655e38a47
commit 2a5461deb1
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
nms-patches/TileEntityBeacon.patch
View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/TileEntityBeacon.java
+++ b/net/minecraft/server/TileEntityBeacon.java
@@ -9,19 +9,61 @@
@@ -9,19 +9,58 @@
import java.util.Set;
import javax.annotation.Nullable;
@@ -20,9 +20,11 @@
- private int k = -1;
+ public int k = -1; // PAIL: private -> public
@Nullable
private MobEffectList l;
- private MobEffectList l;
+ public MobEffectList l; // PAIL: private -> public
@Nullable
private MobEffectList m;
- private MobEffectList m;
+ public MobEffectList m; // PAIL: private -> public
private ItemStack inventorySlot;
private String o;
+ // CraftBukkit start - add fields and methods
@@ -50,20 +52,17 @@
+ }
+
+ public PotionEffect getPrimaryEffect() {
+ return CraftPotionUtil.toBukkit(new MobEffect(this.l, getLevel(), getAmplification(), true, true));
+ return (this.l != null) ? CraftPotionUtil.toBukkit(new MobEffect(this.l, getLevel(), getAmplification(), true, true)) : null;
+ }
+
+ public PotionEffect getSecondaryEffect() {
+ if (hasSecondaryEffect()) {
+ return CraftPotionUtil.toBukkit(new MobEffect(this.m, getLevel(), getAmplification(), true, true));
+ }
+ return null;
+ return (hasSecondaryEffect()) ? CraftPotionUtil.toBukkit(new MobEffect(this.m, getLevel(), getAmplification(), true, true)) : null;
+ }
+ // CraftBukkit end
public TileEntityBeacon() {}
@@ -40,41 +82,79 @@
@@ -40,41 +79,79 @@
}