OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-03 05:26:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixing some entity damage events

Browse source
This commit is contained in:
Andrew Ardill 2011-01-18 07:48:02 +08:00 committed by Warren
parent 8088a329cd
commit 73cbfcb6b6
3 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraft/server/EntityMobs.java
View file

@ -8,9 +8,11 @@ import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.entity.CraftMinecart; import org.bukkit.craftbukkit.entity.CraftMinecart;
import org.bukkit.craftbukkit.entity.CraftMonster; import org.bukkit.craftbukkit.entity.CraftMonster;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
//CraftBukkit end //CraftBukkit end
public class EntityMobs extends EntityCreature implements IMobs { public class EntityMobs extends EntityCreature implements IMobs {
@ -73,8 +75,12 @@ public class EntityMobs extends EntityCreature implements IMobs {
// CraftBukkit start // CraftBukkit start
if(entity instanceof EntityLiving) { if(entity instanceof EntityLiving) {
CraftServer server = ((WorldServer) l).getServer(); CraftServer server = ((WorldServer) l).getServer();
org.bukkit.entity.Entity damager = this.getBukkitEntity();
org.bukkit.entity.Entity damagee = entity.getBukkitEntity();
DamageCause damageType = EntityDamageEvent.DamageCause.ENTITY_ATTACK;
int damageDone = c;
EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(entity.getBukkitEntity(), this.getBukkitEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, c); EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(damager, damagee, damageType, damageDone);
server.getPluginManager().callEvent(edbee); server.getPluginManager().callEvent(edbee);
if (!edbee.isCancelled()){ if (!edbee.isCancelled()){

7
src/main/java/net/minecraft/server/EntityPlayer.java
View file

@ -8,6 +8,7 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
// CraftBukkit end // CraftBukkit end
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
public abstract class EntityPlayer extends EntityLiving { public abstract class EntityPlayer extends EntityLiving {
@ -340,8 +341,12 @@ public abstract class EntityPlayer extends EntityLiving {
// CraftBukkit start // CraftBukkit start
if(entity instanceof EntityLiving) { if(entity instanceof EntityLiving) {
CraftServer server = ((WorldServer) l).getServer(); CraftServer server = ((WorldServer) l).getServer();
org.bukkit.entity.Entity damager = this.getBukkitEntity();
org.bukkit.entity.Entity damagee = entity.getBukkitEntity();
DamageCause damageType = EntityDamageEvent.DamageCause.ENTITY_ATTACK;
int damageDone = i;
EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(entity.getBukkitEntity(), this.getBukkitEntity(), EntityDamageEvent.DamageCause.ENTITY_ATTACK, i); EntityDamageByEntityEvent edbee = new EntityDamageByEntityEvent(damager, damagee, damageType, damageDone);
server.getPluginManager().callEvent(edbee); server.getPluginManager().callEvent(edbee);
if (!edbee.isCancelled()){ if (!edbee.isCancelled()){

34
src/main/java/net/minecraft/server/Explosion.java
View file

@ -8,9 +8,13 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.event.entity.EntityDamageByBlockEvent; import org.bukkit.event.entity.EntityDamageByBlockEvent;
import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.craftbukkit.CraftWorld; import org.bukkit.craftbukkit.CraftWorld;
import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlock;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
// CraftBukkit end // CraftBukkit end
import java.util.*; import java.util.*;
@ -115,32 +119,36 @@ public class Explosion {
double d14 = (1.0D - d11) * d13; double d14 = (1.0D - d11) * d13;
// CraftBukkit start - explosion damage hook // CraftBukkit start - explosion damage hook
int damage = (int) (((d14 * d14 + d14) / 2D) * 8D * (double) f + 1.0D); CraftServer server = ((WorldServer) i).getServer();
CraftServer servr = ((WorldServer) i).getServer(); org.bukkit.entity.Entity damagee = null;
CraftEntity damagee = null; DamageCause damageType;
if (entity instanceof EntityPlayerMP) { int damageDone = (int) (((d14 * d14 + d14) / 2D) * 8D * (double) f + 1.0D);
damagee = new CraftPlayer(servr, (EntityPlayerMP) entity);
} else if (entity instanceof EntityLiving) { if(entity instanceof EntityLiving) {
damagee = new CraftLivingEntity(servr, (EntityLiving) entity); damagee = entity.getBukkitEntity();
} }
if (e == null) { // Block explosion if (e == null) { // Block explosion
// Craftbukkit TODO: get the x/y/z of the tnt block? // Craftbukkit TODO: get the x/y/z of the tnt block?
EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(null, damagee, EntityDamageEvent.DamageCause.BLOCK_EXPLOSION, damage); damageType = EntityDamageEvent.DamageCause.BLOCK_EXPLOSION;
servr.getPluginManager().callEvent(edbbe); EntityDamageByBlockEvent edbbe = new EntityDamageByBlockEvent(null, damagee, damageType, damageDone);
server.getPluginManager().callEvent(edbbe);
if (!edbbe.isCancelled()) { if (!edbbe.isCancelled()) {
entity.a(e, edbbe.getDamage()); entity.a(e, edbbe.getDamage());
} }
} else { } else {
CraftEntity damager = null; CraftEntity damager = null;
//TODO org.bukkit.entity.Entity damager = e.getBukkitEntity();
if (e instanceof EntityPlayerMP) { if (e instanceof EntityPlayerMP) {
// not possible in normal operations // not possible in normal operations
damager = new CraftPlayer(servr, (EntityPlayerMP) e); damager = new CraftPlayer(server, (EntityPlayerMP) e);
} else if (e instanceof EntityLiving) { } else if (e instanceof EntityLiving) {
damager = new CraftLivingEntity(servr, (EntityLiving) e); damager = new CraftLivingEntity(server, (EntityLiving) e);
} }
EntityDamageByEntityEvent edbbe = new EntityDamageByEntityEvent(damager, damagee, EntityDamageEvent.DamageCause.ENTITY_EXPLOSION, damage); damageType = EntityDamageEvent.DamageCause.ENTITY_ATTACK;
servr.getPluginManager().callEvent(edbbe);
EntityDamageByEntityEvent edbbe = new EntityDamageByEntityEvent(damager, damagee, damageType, damageDone);
server.getPluginManager().callEvent(edbbe);
if (!edbbe.isCancelled()) { if (!edbbe.isCancelled()) {
entity.a(e, edbbe.getDamage()); entity.a(e, edbbe.getDamage());