SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Download Patch File Download Diff File Expand all files Collapse all files

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)
{
super(Event.Type.ENTITY_DAMAGEDBY_BLOCK, damagee, cause, damage);
super(Event.Type.ENTITY_DAMAGED, damagee, cause, damage);
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)
{
super(Event.Type.ENTITY_DAMAGEDBY_ENTITY, damagee, cause, damage);
super(Event.Type.ENTITY_DAMAGED, damagee, cause, damage);
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;
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;
Random random = new Random();
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 onEntityDamageByBlock(EntityDamageByBlockEvent event) {
}
public void onEntityDamageByEntity(EntityDamageByEntityEvent event) {
}
public void onEntityDamageByProjectile(EntityDamageByProjectileEvent event) {
}
public void onEntityCombust(EntityCombustEvent event) {
}