OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-21 14:39:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Shifting damage events per http://forums.bukkit.org/threads/oops-i-broke-your-plugins.599/#post-67424 (This breaks stuff!)

Browse source 
By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
Bukkit/Spigot 2011-02-19 17:08:14 +00:00
parent ffe5fb2dfb
commit a36de75a17
6 changed files with 3 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
paper-api/src/main/java/org/bukkit/event/Event.java
View file

@ -483,28 +483,6 @@ public abstract class Event {
*/ */
CREATURE_SPAWN (Category.LIVING_ENTITY), CREATURE_SPAWN (Category.LIVING_ENTITY),
/**
* Called when a LivingEntity is damaged by the environment (for example,
* falling or lava)
*
* @see org.bukkit.event.entity.EntityDamageByBlockEvent
*/
ENTITY_DAMAGEDBY_BLOCK (Category.LIVING_ENTITY),
/**
* Called when a LivingEntity is damaged by another LivingEntity
*
* @see org.bukkit.event.entity.EntityDamageByEntityEvent
*/
ENTITY_DAMAGEDBY_ENTITY (Category.LIVING_ENTITY),
/**
* Called when a LivingEntity is damaged by a projectile Entity
*
* @see org.bukkit.event.entity.EntityDamageByProjectileEvent
*/
ENTITY_DAMAGEDBY_PROJECTILE (Category.LIVING_ENTITY),
/** /**
* Called when a LivingEntity is damaged with no source. * Called when a LivingEntity is damaged with no source.
* *

2
paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java
View file

@ -14,7 +14,7 @@ public class EntityDamageByBlockEvent extends EntityDamageEvent implements Cance
public EntityDamageByBlockEvent(Block damager, Entity damagee, DamageCause cause, int damage) public EntityDamageByBlockEvent(Block damager, Entity damagee, DamageCause cause, int damage)
{ {
super(Event.Type.ENTITY_DAMAGEDBY_BLOCK, damagee, cause, damage); super(Event.Type.ENTITY_DAMAGED, damagee, cause, damage);
this.damager = damager; this.damager = damager;
} }

2
paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java
View file

@ -13,7 +13,7 @@ public class EntityDamageByEntityEvent extends EntityDamageEvent implements Canc
public EntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage) public EntityDamageByEntityEvent(Entity damager, Entity damagee, DamageCause cause, int damage)
{ {
super(Event.Type.ENTITY_DAMAGEDBY_ENTITY, damagee, cause, damage); super(Event.Type.ENTITY_DAMAGED, damagee, cause, damage);
this.damager = damager; this.damager = damager;
} }

2
paper-api/src/main/java/org/bukkit/event/entity/EntityDamageByProjectileEvent.java
View file

@ -11,7 +11,7 @@ public class EntityDamageByProjectileEvent extends EntityDamageByEntityEvent {
private boolean bounce; private boolean bounce;
public EntityDamageByProjectileEvent(Entity damager, Entity damagee, Entity projectile, DamageCause cause, int damage) { public EntityDamageByProjectileEvent(Entity damager, Entity damagee, Entity projectile, DamageCause cause, int damage) {
super(Event.Type.ENTITY_DAMAGEDBY_PROJECTILE, damager, damagee, cause, damage); super(Event.Type.ENTITY_DAMAGED, damager, damagee, cause, damage);
this.projectile = projectile; this.projectile = projectile;
Random random = new Random(); Random random = new Random();
this.bounce = random.nextBoolean(); this.bounce = random.nextBoolean();

9
paper-api/src/main/java/org/bukkit/event/entity/EntityListener.java
View file

@ -12,15 +12,6 @@ public class EntityListener implements Listener {
public void onCreatureSpawn(CreatureSpawnEvent event) { public void onCreatureSpawn(CreatureSpawnEvent event) {
} }
public void onEntityDamageByBlock(EntityDamageByBlockEvent event) {
}
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
}
public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
}
public void onEntityCombust(EntityCombustEvent event) { public void onEntityCombust(EntityCombustEvent event) {
} }

15
paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
View file

@ -313,21 +313,6 @@ public final class JavaPluginLoader implements PluginLoader {
}; };
// Entity Events // Entity Events
case ENTITY_DAMAGEDBY_BLOCK:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((EntityListener)listener).onEntityDamageByBlock( (EntityDamageByBlockEvent)event );
}
};
case ENTITY_DAMAGEDBY_ENTITY:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((EntityListener)listener).onEntityDamageByEntity( (EntityDamageByEntityEvent)event );
}
};
case ENTITY_DAMAGEDBY_PROJECTILE:
return new EventExecutor() { public void execute( Listener listener, Event event ) {
((EntityListener)listener).onEntityDamageByProjectile( (EntityDamageByProjectileEvent)event );
}
};
case ENTITY_DAMAGED: case ENTITY_DAMAGED:
return new EventExecutor() { public void execute( Listener listener, Event event ) { return new EventExecutor() { public void execute( Listener listener, Event event ) {
((EntityListener)listener).onEntityDamage( (EntityDamageEvent)event ); ((EntityListener)listener).onEntityDamage( (EntityDamageEvent)event );