summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-07-23 10:55:43 +1000
committermd_5 <git@md-5.net>2016-07-23 10:55:43 +1000
commit2a5461deb10cbf1ca00797716b0e7d5523d1bdaa (patch)
treeecda861bff432292a9d8812e9bfc10ba7c841dc6 /src
parent7655e38a47a6d09d7b905b75bc5c68b677f034dc (diff)
downloadcraftbukkit-2a5461deb10cbf1ca00797716b0e7d5523d1bdaa.tar
craftbukkit-2a5461deb10cbf1ca00797716b0e7d5523d1bdaa.tar.gz
craftbukkit-2a5461deb10cbf1ca00797716b0e7d5523d1bdaa.tar.lz
craftbukkit-2a5461deb10cbf1ca00797716b0e7d5523d1bdaa.tar.xz
craftbukkit-2a5461deb10cbf1ca00797716b0e7d5523d1bdaa.zip
Enhance Beacon Block API
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
index 486bc3ec..1cb5e589 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeacon.java
@@ -3,15 +3,18 @@ package org.bukkit.craftbukkit.block;
import java.util.ArrayList;
import java.util.Collection;
import net.minecraft.server.EntityHuman;
+import net.minecraft.server.MobEffectList;
import net.minecraft.server.TileEntityBeacon;
import org.bukkit.Material;
import org.bukkit.block.Beacon;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.inventory.CraftInventoryBeacon;
+import org.bukkit.craftbukkit.potion.CraftPotionUtil;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.Inventory;
import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
public class CraftBeacon extends CraftBlockState implements Beacon {
private final CraftWorld world;
@@ -73,7 +76,17 @@ public class CraftBeacon extends CraftBlockState implements Beacon {
}
@Override
+ public void setPrimaryEffect(PotionEffectType effect) {
+ beacon.l = (effect != null) ? MobEffectList.fromId(effect.getId()) : null;
+ }
+
+ @Override
public PotionEffect getSecondaryEffect() {
return beacon.getSecondaryEffect();
}
+
+ @Override
+ public void setSecondaryEffect(PotionEffectType effect) {
+ beacon.m = (effect != null) ? MobEffectList.fromId(effect.getId()) : null;
+ }
}