Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-01 06:53:44 +01:00
Code Issues Projects Releases Wiki Activity

Added wolf damage and target events. Thanks Deaygo!

Browse Source
This commit is contained in:
EvilSeph 2011-06-17 23:47:33 -04:00
parent b0fcbe7fca
commit 87b421767c
1 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/net/minecraft/server/EntityWolf.java
View File

@ -4,7 +4,14 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
// CraftBukkit start // CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.event.CraftEventFactory; import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
import org.bukkit.event.entity.EntityTameEvent; import org.bukkit.event.entity.EntityTameEvent;
// CraftBukkit end // CraftBukkit end
@ -233,8 +240,25 @@ public class EntityWolf extends EntityAnimal {
} else { } else {
if (!this.A() && !this.isAngry()) { if (!this.A() && !this.isAngry()) {
if (entity instanceof EntityHuman) { if (entity instanceof EntityHuman) {
this.setAngry(true); // CraftBukkit start
this.target = (Entity) entity; CraftServer server = this.world.getServer();
org.bukkit.entity.Entity bukkitTarget = null;
if (entity != null) {
bukkitTarget = entity.getBukkitEntity();
}
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, TargetReason.TARGET_ATTACKED_ENTITY);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
if (event.getTarget() == null) {
this.target = null;
} else {
this.setAngry(true);
this.target = ((CraftEntity) event.getTarget()).getHandle();
}
}
// CraftBukkit end
} }
if (entity instanceof EntityArrow && ((EntityArrow) entity).shooter != null) { if (entity instanceof EntityArrow && ((EntityArrow) entity).shooter != null) {
@ -250,10 +274,27 @@ public class EntityWolf extends EntityAnimal {
EntityWolf entitywolf = (EntityWolf) entity1; EntityWolf entitywolf = (EntityWolf) entity1;
if (!entitywolf.A() && entitywolf.target == null) { if (!entitywolf.A() && entitywolf.target == null) {
entitywolf.target = (Entity) entity; // CraftBukkit start
if (entity instanceof EntityHuman) { CraftServer server = this.world.getServer();
entitywolf.setAngry(true); org.bukkit.entity.Entity bukkitTarget = null;
if (entity != null) {
bukkitTarget = entity.getBukkitEntity();
} }
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, TargetReason.TARGET_ATTACKED_ENTITY);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
if (event.getTarget() == null) {
this.target = null;
} else {
entitywolf.target = (Entity) entity;
if (entity instanceof EntityHuman) {
entitywolf.setAngry(true);
}
}
}
// CraftBukkit end
} }
} }
} }
@ -291,8 +332,19 @@ public class EntityWolf extends EntityAnimal {
if (this.A()) { if (this.A()) {
b0 = 4; b0 = 4;
} }
// CraftBukkit start
CraftServer server = this.world.getServer();
org.bukkit.entity.Entity damager = this.getBukkitEntity();
org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity();
DamageCause damageCause = EntityDamageEvent.DamageCause.ENTITY_ATTACK;
entity.damageEntity(this, b0); EntityDamageByEntityEvent event = new EntityDamageByEntityEvent(damager, damagee, damageCause, b0);
server.getPluginManager().callEvent(event);
if (!event.isCancelled()) {
entity.damageEntity(this, b0);
}
// CraftBukkit end
} }
} }