diff options
| author | Zeerix <zeerix@draig.de> | 2012-01-20 09:56:02 +0100 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-01-24 02:12:41 -0500 |
| commit | 872dad554044aae57b786d5c14523cee5778ebc7 (patch) | |
| tree | 411a68de7031801842efea9d963fef106951ca92 /src/main/java/org | |
| parent | 74ead3abd17c4dfb0987a143483b2ca68ce1553f (diff) | |
| download | craftbukkit-872dad554044aae57b786d5c14523cee5778ebc7.tar craftbukkit-872dad554044aae57b786d5c14523cee5778ebc7.tar.gz craftbukkit-872dad554044aae57b786d5c14523cee5778ebc7.tar.lz craftbukkit-872dad554044aae57b786d5c14523cee5778ebc7.tar.xz craftbukkit-872dad554044aae57b786d5c14523cee5778ebc7.zip | |
[Bleeding] Implemented PotionSplashEvent. Closes BUKKIT-307
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java index d37ce1ad..db45fb60 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.event; import java.net.InetAddress; import java.util.List; +import java.util.Map; import net.minecraft.server.ChunkCoordinates; import net.minecraft.server.Entity; @@ -24,6 +25,7 @@ import net.minecraft.server.EntityMushroomCow; import net.minecraft.server.EntityPig; import net.minecraft.server.EntityPigZombie; import net.minecraft.server.EntityPlayer; +import net.minecraft.server.EntityPotion; import net.minecraft.server.EntitySheep; import net.minecraft.server.EntitySilverfish; import net.minecraft.server.EntitySkeleton; @@ -56,6 +58,7 @@ import org.bukkit.entity.Arrow; import org.bukkit.entity.CreatureType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; +import org.bukkit.entity.ThrownPotion; import org.bukkit.event.Event.Type; import org.bukkit.event.block.*; import org.bukkit.event.entity.*; @@ -65,6 +68,7 @@ import org.bukkit.event.player.*; import org.bukkit.event.server.ServerListPingEvent; public class CraftEventFactory { + // helper methods private static boolean canBuild(CraftWorld world, Player player, int x, int z) { WorldServer worldServer = world.getHandle(); int spawnSize = Bukkit.getServer().getSpawnRadius(); @@ -322,6 +326,17 @@ public class CraftEventFactory { } /** + * PotionSplashEvent + */ + public static PotionSplashEvent callPotionSplashEvent(EntityPotion potion, Map<LivingEntity, Double> affectedEntities) { + ThrownPotion thrownPotion = (ThrownPotion) potion.getBukkitEntity(); + + PotionSplashEvent event = new PotionSplashEvent(thrownPotion, affectedEntities); + Bukkit.getPluginManager().callEvent(event); + return event; + } + + /** * BlockFadeEvent */ public static BlockFadeEvent callBlockFadeEvent(Block block, int type) { |