SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

EntityTargetEvent

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Taylor Kelly 2011-01-26 14:26:24 -05:00
Ursprung 0ba870434e
Commit c07e32c1de
4 geänderte Dateien mit 86 neuen und 8 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

30
src/main/java/net/minecraft/server/EntityCreature.java
Datei anzeigen

@ -5,6 +5,9 @@ import java.util.Random;
// CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftCreature;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
// CraftBukkit end
public class EntityCreature extends EntityLiving {
@ -27,12 +30,37 @@ public class EntityCreature extends EntityLiving {
float f = 16F;
if (d == null) {
d = l();
// CraftBukkit start
Entity target = l();
if(target != null) {
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), target.getBukkitEntity(), TargetReason.CLOSEST_PLAYER);
CraftServer server = ((WorldServer) this.l).getServer();
server.getPluginManager().callEvent(event);
if(!event.isCancelled()) {
if(event.getTarget() == null) {
d = null;
} else {
d = ((CraftEntity) event.getTarget()).getHandle();
}
}
}
// CraftBukkit end
if (d != null) {
a = l.a(((Entity) (this)), d, f);
}
} else if (!d.B()) {
// CraftBukkit start
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), null, TargetReason.TARGET_DIED);
CraftServer server = ((WorldServer) this.l).getServer();
server.getPluginManager().callEvent(event);
if(!event.isCancelled()) {
if(event.getTarget() == null) {
d = null;
} else {
d = ((CraftEntity) event.getTarget()).getHandle();
}
}
// CraftBukkit end
} else {
float f1 = d.a(((Entity) (this)));

20
src/main/java/net/minecraft/server/EntityMobs.java
Datei anzeigen

@ -5,10 +5,13 @@ import java.util.Random;
// CraftBukkit start
import org.bukkit.craftbukkit.entity.CraftMonster;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.event.entity.EntityDamageByEntityEvent;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
// CraftBukkit end
public class EntityMobs extends EntityCreature implements IMobs {
@ -57,7 +60,22 @@ public class EntityMobs extends EntityCreature implements IMobs {
return true;
}
if (entity != this) {
d = entity;
// CraftBukkit start
org.bukkit.entity.Entity bukkitTarget = null;
if(entity != null) {
bukkitTarget = entity.getBukkitEntity();
}
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, TargetReason.TARGET_ATTACKED_ENTITY);
CraftServer server = ((WorldServer) this.l).getServer();
server.getPluginManager().callEvent(event);
if(!event.isCancelled()) {
if(event.getTarget() == null) {
d = null;
} else {
d = ((CraftEntity) event.getTarget()).getHandle();
}
}
// CraftBukkit end
}
return true;
} else {

20
src/main/java/net/minecraft/server/EntityPigZombie.java
Datei anzeigen

@ -5,7 +5,10 @@ import java.util.Random;
// CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftPigZombie;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
// CraftBukkit end
public class EntityPigZombie extends EntityZombie {
@ -82,10 +85,25 @@ public class EntityPigZombie extends EntityZombie {
}
private void g(Entity entity) {
d = entity;
// CraftBukkit start
org.bukkit.entity.Entity bukkitTarget = null;
if(entity != null) {
bukkitTarget = entity.getBukkitEntity();
}
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), bukkitTarget, TargetReason.PIG_ZOMBIE_TARGET);
CraftServer server = ((WorldServer) this.l).getServer();
server.getPluginManager().callEvent(event);
if(!event.isCancelled()) {
if(event.getTarget() == null) {
d = null;
} else {
d = ((CraftEntity) event.getTarget()).getHandle();
a = 400 + W.nextInt(400);
b = W.nextInt(40);
}
}
// CraftBukkit end
}
protected String e() {
return "mob.zombiepig.zpig";

14
src/main/java/net/minecraft/server/EntitySpider.java
Datei anzeigen

@ -4,7 +4,10 @@ import java.util.Random;
// CraftBukkit start
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.craftbukkit.entity.CraftEntity;
import org.bukkit.craftbukkit.entity.CraftSpider;
import org.bukkit.event.entity.EntityTargetEvent;
import org.bukkit.event.entity.EntityTargetEvent.TargetReason;
// CraftBukkit stop
public class EntitySpider extends EntityMobs {
@ -52,9 +55,20 @@ public class EntitySpider extends EntityMobs {
float f2 = b(1.0F);
if (f2 > 0.5F && W.nextInt(100) == 0) {
// CraftBukkit start
EntityTargetEvent event = new EntityTargetEvent(this.getBukkitEntity(), null, TargetReason.FORGOT_TARGET);
CraftServer server = ((WorldServer) this.l).getServer();
server.getPluginManager().callEvent(event);
if(!event.isCancelled()) {
if(event.getTarget() == null) {
this.d = null;
} else {
this.d = ((CraftEntity) event.getTarget()).getHandle();
}
return;
}
// CraftBukkit end
}
if (f1 > 2.0F && f1 < 6F && W.nextInt(10) == 0) {
if (A) {
double d = entity.p - p;