twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 11:45:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Implementation of the EntityDamage*Events.

Browse Source 
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.
This commit is contained in:
Andrew Ardill
2011-01-12 16:48:19 +11:00
committed by Erik Broes
parent 807de6ee22
commit ceaf94d5bb
12 changed files with 1784 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/net/minecraft/server/Entity.java
View File

@@ -5,6 +5,9 @@ import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.entity.CraftPlayer;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.Event.Type;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end
@@ -212,7 +215,21 @@ public abstract class Entity {
}
} else {
if (Z % 20 == 0) {
a(((Entity) (null)), 1);
// CraftBukkit start
if(this instanceof EntityLiving) {
CraftServer server = ((WorldServer)l).getServer();
CraftEntity damagee = new CraftLivingEntity(server, (EntityLiving)this);
EntityDamageEvent ede = new EntityDamageEvent(damagee, EntityDamageEvent.DamageCause.DROWNING, 1);
server.getPluginManager().callEvent(ede);
if (!ede.isCancelled()){
a(((Entity) (null)), ede.getDamage());
}
} else {
a(((Entity) (null)), 1);
}
// CraftBukkit end
}
Z--;
}
@@ -232,8 +249,27 @@ public abstract class Entity {
protected void s() {
if (!ae) {
a(((Entity) (null)), 4);
Z = 600;
// CraftBukkit start
if(this instanceof EntityLiving) {
CraftServer server = ((WorldServer)l).getServer();
CraftEntity defender = new CraftLivingEntity(server, (EntityLiving) this);
EntityDamageByBlockEvent ede = new EntityDamageByBlockEvent(null, defender, EntityDamageEvent.DamageCause.LAVA, 4);
server.getPluginManager().callEvent(ede);
if (!ede.isCancelled()){
a(((Entity) (null)), ede.getDamage());
}
EntityCombustEvent ece = new EntityCombustEvent(Type.ENTITY_COMBUST, defender);
server.getPluginManager().callEvent(ece);
if (!ece.isCancelled()){
Z = 600;
}
} else {
a(((Entity) (null)), 4);
Z = 600;
}
// CraftBukkit end
}
}
@@ -479,7 +515,10 @@ public abstract class Entity {
EntityDamageEvent ede = new EntityDamageEvent(defender, EntityDamageEvent.DamageCause.FIRE, i1);
server.getPluginManager().callEvent(ede);
if (ede.isCancelled()) return;
if (!ede.isCancelled()){
a(((Entity) (null)), ede.getDamage());
}
return;
}
// CraftBukkit end
a(((Entity) (null)), i1);