From ceaf94d5bb761b54249d22de08226167319099be Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Wed, 12 Jan 2011 16:48:19 +1100 Subject: Implementation of the EntityDamage*Events. Many files were added to enable the correct hooking of these events, and a new event EntityDamageByProjectileEvent. EntityDamageByProjectileEvent adds the ability to get the projectile entity (such as an egg) and also set if the projectile 'bounces'. Only two projectiles currently respond to bouncing, Arrow and Fish - were if the fish bounces it means the fish is not hooked. Bouncing is independent of any damage caused via the event. In addition, the changes to EntityDamageEvent that enable setting post-event damage were implemented in all hooks. Finally, a bug in CraftArrow was fixed, where the constructor was not declared public. --- .../org/bukkit/craftbukkit/entity/CraftFireball.java | 17 +++++++++++++++++ .../java/org/bukkit/craftbukkit/entity/CraftFish.java | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java create mode 100644 src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java new file mode 100644 index 00000000..688c43d1 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java @@ -0,0 +1,17 @@ +package org.bukkit.craftbukkit.entity; + +import net.minecraft.server.EntityFireball; + +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.entity.Fireball; + +/** + * An egg. + * + * @author Cogito + */ +public class CraftFireball extends CraftEntity implements Fireball { + public CraftFireball(CraftServer server, EntityFireball ent) { + super(server, ent); + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java new file mode 100644 index 00000000..ac832c13 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java @@ -0,0 +1,17 @@ +package org.bukkit.craftbukkit.entity; + +import net.minecraft.server.EntityFish; + +import org.bukkit.craftbukkit.CraftServer; +import org.bukkit.entity.Fish; + +/** + * An egg. + * + * @author Cogito + */ +public class CraftFish extends CraftEntity implements Fish { + public CraftFish(CraftServer server, EntityFish ent) { + super(server, ent); + } +} -- cgit v1.2.3