TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-09-11 12:49:32 +00:00
Code Issues Projects Releases Wiki Activity

- Changed PlayerBendingDeathEvent to EntityBendingDeathEvent

Browse source
This commit is contained in:
savior67 2016-02-13 12:42:35 -05:00
parent 2953a7b921
commit 4ac4a2f646
3 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/com/projectkorra/projectkorra/GeneralMethods.java
View file

@ -95,7 +95,7 @@ import com.projectkorra.projectkorra.earthbending.EarthBlast;
import com.projectkorra.projectkorra.earthbending.EarthPassive;
import com.projectkorra.projectkorra.event.BendingReloadEvent;
import com.projectkorra.projectkorra.event.BindingUpdateEvent;
import com.projectkorra.projectkorra.event.PlayerBendingDeathEvent;
import com.projectkorra.projectkorra.event.EntityBendingDeathEvent;
import com.projectkorra.projectkorra.firebending.Combustion;
import com.projectkorra.projectkorra.firebending.FireBlast;
import com.projectkorra.projectkorra.firebending.FireCombo;
@ -367,8 +367,8 @@ public class GeneralMethods {
if (Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus")) {
NCPExemptionManager.exemptPermanently(player, CheckType.FIGHT_REACH);
}
if (((LivingEntity) entity).getHealth() - damage <= 0 && entity instanceof Player && !entity.isDead()) {
PlayerBendingDeathEvent event = new PlayerBendingDeathEvent((Player) entity, player, damage, ability);
if (((LivingEntity) entity).getHealth() - damage <= 0 && !entity.isDead()) {
EntityBendingDeathEvent event = new EntityBendingDeathEvent(entity, player, damage, ability);
Bukkit.getServer().getPluginManager().callEvent(event);
}
((LivingEntity) entity).damage(damage, player);

10
src/com/projectkorra/projectkorra/PKListener.java
View file

@ -54,8 +54,8 @@ import com.projectkorra.projectkorra.earthbending.RaiseEarthWall;
import com.projectkorra.projectkorra.earthbending.SandSpout;
import com.projectkorra.projectkorra.earthbending.Shockwave;
import com.projectkorra.projectkorra.earthbending.Tremorsense;
import com.projectkorra.projectkorra.event.EntityBendingDeathEvent;
import com.projectkorra.projectkorra.event.HorizontalVelocityChangeEvent;
import com.projectkorra.projectkorra.event.PlayerBendingDeathEvent;
import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
import com.projectkorra.projectkorra.firebending.Blaze;
import com.projectkorra.projectkorra.firebending.BlazeArc;
@ -694,8 +694,8 @@ public class PKListener implements Listener {
}
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerBendingDeath(PlayerBendingDeathEvent event) {
if (ConfigManager.deathMsgConfig.get().getBoolean("Properties.Enabled")) {
public void onPlayerBendingDeath(EntityBendingDeathEvent event) {
if (ConfigManager.deathMsgConfig.get().getBoolean("Properties.Enabled") && event.getVictim() instanceof Player) {
CoreAbility ability = CoreAbility.getAbility(event.getAbility());
if (ability == null) {
@ -705,8 +705,8 @@ public class PKListener implements Listener {
StringBuilder sb = new StringBuilder();
sb.append(ability.getElement().getColor());
sb.append(event.getAbility());
BENDING_PLAYER_DEATH.put(event.getVictim(), sb.toString());
final Player player = event.getVictim();
BENDING_PLAYER_DEATH.put((Player) event.getVictim(), sb.toString());
final Player player = (Player) event.getVictim();
new BukkitRunnable() {
@Override

8
src/com/projectkorra/projectkorra/event/PlayerBendingDeathEvent.java → src/com/projectkorra/projectkorra/event/EntityBendingDeathEvent.java
View file

@ -13,10 +13,10 @@ import org.bukkit.event.HandlerList;
* @author kingbirdy
*/
public class PlayerBendingDeathEvent extends Event {
public class EntityBendingDeathEvent extends Event {
public static final HandlerList handlers = new HandlerList();
private Player victim;
private Entity victim;
private Player attacker;
private String ability;
private double damage;
@ -28,7 +28,7 @@ public class PlayerBendingDeathEvent extends Event {
* @param damage the amount of damage done in the attack that killed the victim
* @param ability the ability used to kill the victim
*/
public PlayerBendingDeathEvent(Player victim, Player attacker, double damage, String ability) {
public EntityBendingDeathEvent(Entity victim, Player attacker, double damage, String ability) {
this.victim = victim;
this.attacker = attacker;
this.ability = ability;
@ -39,7 +39,7 @@ public class PlayerBendingDeathEvent extends Event {
*
* @return the player who was killed
*/
public Player getVictim() {
public Entity getVictim() {
return victim;
}