Implement ItemMergeEvent, ExpBottleEvent, CreeperPowerEvent (#925)

Related to #922
GlowstoneMC · May 27, 2018 · 0f76fe2 · 0f76fe2
1 parent b5ced2d
commit 0f76fe2
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/src/main/java/net/glowstone/entity/monster/GlowCreeper.java b/src/main/java/net/glowstone/entity/monster/GlowCreeper.java
@@ -4,12 +4,16 @@
 import java.util.List;
 import lombok.Getter;
 import lombok.Setter;
+
+import net.glowstone.EventFactory;
 import net.glowstone.entity.meta.MetadataIndex;
 import org.bukkit.Location;
 import org.bukkit.Sound;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LightningStrike;
+import org.bukkit.event.entity.CreeperPowerEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
 
 public class GlowCreeper extends GlowMonster implements Creeper {
@@ -58,8 +62,16 @@ protected Sound getHurtSound() {
     @Override
     public void damage(double amount, Entity source, DamageCause cause) {
         super.damage(amount, source, cause);
-        if (DamageCause.LIGHTNING.equals(cause)) {
-            setPowered(true);
+        if (DamageCause.LIGHTNING.equals(cause) && !isPowered()) {
+            CreeperPowerEvent event = EventFactory.getInstance()
+                    .callEvent(new CreeperPowerEvent(
+                            this,
+                            (LightningStrike) source,
+                            CreeperPowerEvent.PowerCause.LIGHTNING));
+
+            if (!event.isCancelled()) {
+                setPowered(true);
+            }
         }
     }
 }
diff --git a/src/main/java/net/glowstone/entity/objects/GlowItem.java b/src/main/java/net/glowstone/entity/objects/GlowItem.java
@@ -21,6 +21,7 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Item;
 import org.bukkit.event.entity.ItemDespawnEvent;
+import org.bukkit.event.entity.ItemMergeEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
@@ -129,10 +130,17 @@ public void pulse() {
                     if (entity != this && ((GlowItem) entity).getItemStack()
                             .isSimilar(getItemStack())) {
                         ItemStack clone = getItemStack().clone();
-                        clone.setAmount(
-                                ((GlowItem) entity).getItemStack().getAmount() + clone.getAmount());
-                        entity.remove();
-                        setItemStack(clone);
+
+                        ItemMergeEvent event = EventFactory.getInstance()
+                                .callEvent(new ItemMergeEvent((GlowItem) entity, this));
+
+                        if (!event.isCancelled()) {
+                            clone.setAmount(
+                                    ((GlowItem) entity).getItemStack().getAmount()
+                                            + clone.getAmount());
+                            entity.remove();
+                            setItemStack(clone);
+                        }
                     }
                 }
             }

diff --git a/src/main/java/net/glowstone/entity/projectile/GlowThrownExpBottle.java b/src/main/java/net/glowstone/entity/projectile/GlowThrownExpBottle.java
@@ -1,6 +1,8 @@
 package net.glowstone.entity.projectile;
 
 import java.util.concurrent.ThreadLocalRandom;
+
+import net.glowstone.EventFactory;
 import net.glowstone.entity.objects.GlowExperienceOrb;
 import net.glowstone.net.message.play.entity.SpawnObjectMessage;
 import org.bukkit.Location;
@@ -9,6 +11,7 @@
 import org.bukkit.entity.ExperienceOrb;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.ThrownExpBottle;
+import org.bukkit.event.entity.ExpBottleEvent;
 
 public class GlowThrownExpBottle extends GlowProjectile implements ThrownExpBottle {
 
@@ -28,6 +31,9 @@ public void collide(LivingEntity entity) {
 
     private void spawnOrb() {
         int xp = ThreadLocalRandom.current().nextInt(9) + 3;
+        ExpBottleEvent event = EventFactory.getInstance()
+                .callEvent(new ExpBottleEvent(this, xp));
+        xp = event.getExperience();
         ExperienceOrb orb = (ExperienceOrb) world.spawnEntity(location, EntityType.EXPERIENCE_ORB);
         orb.setExperience(xp);
         if (orb instanceof GlowExperienceOrb) {