sigonasr2
/
SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compatibility with 1.7.3. ProjectileShooter instances handled.

Browse Source
dev
sigonasr2 11 years ago
parent 8f97b8b94b
commit e4bfcc023a
1 changed files with 7 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 14
      BankEconomyMod/src/me/kaZep/Base/PlayerListener.java

14
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
Unescape View File

@ -5593,7 +5593,7 @@ implements Listener
@EventHandler @EventHandler
public void onPotionSplash(PotionSplashEvent e) { public void onPotionSplash(PotionSplashEvent e) {
ThrownPotion pot = e.getEntity(); ThrownPotion pot = e.getEntity();
LivingEntity theshooter = pot.getShooter(); LivingEntity theshooter = (LivingEntity)pot.getShooter();
if (pot.getItem().getItemMeta().hasLore() && if (pot.getItem().getItemMeta().hasLore() &&
pot.getItem().getItemMeta().getLore().contains(ChatColor.GOLD+"+50% Attack Speed (1:20)")) { pot.getItem().getItemMeta().getLore().contains(ChatColor.GOLD+"+50% Attack Speed (1:20)")) {
int duration = 1600; int duration = 1600;
@ -5856,7 +5856,7 @@ implements Listener
try { try {
Iterator<LivingEntity> entities = e.getAffectedEntities().iterator(); Iterator<LivingEntity> entities = e.getAffectedEntities().iterator();
Player shooter; Player shooter;
if (e.getPotion().getShooter().getType() == EntityType.PLAYER) { if (((LivingEntity)e.getPotion().getShooter()).getType() == EntityType.PLAYER) {
shooter=(Player)e.getPotion().getShooter(); shooter=(Player)e.getPotion().getShooter();
if (this.plugin.PlayerinJob(shooter,"Support")) { if (this.plugin.PlayerinJob(shooter,"Support")) {
//Bukkit.getPlayer("sigonasr2").sendMessage("Shooter is "+shooter.getName()); //Bukkit.getPlayer("sigonasr2").sendMessage("Shooter is "+shooter.getName());
@ -9918,7 +9918,7 @@ implements Listener
} }
if (e.getDamager() instanceof Projectile) { if (e.getDamager() instanceof Projectile) {
if (((Projectile)e.getDamager()).getShooter() instanceof LivingEntity) { if (((Projectile)e.getDamager()).getShooter() instanceof LivingEntity) {
LivingEntity l2 = ((Projectile)e.getDamager()).getShooter(); LivingEntity l2 = (LivingEntity)(((Projectile)e.getDamager()).getShooter());
if (l2.hasPotionEffect(PotionEffectType.INVISIBILITY)) {l2.removePotionEffect(PotionEffectType.INVISIBILITY);} if (l2.hasPotionEffect(PotionEffectType.INVISIBILITY)) {l2.removePotionEffect(PotionEffectType.INVISIBILITY);}
for (int i=0;i<this.plugin.powered_mob_list.size();i++) { for (int i=0;i<this.plugin.powered_mob_list.size();i++) {
if (this.plugin.powered_mob_list.get(i).power_time+40<=Main.SERVER_TICK_TIME && this.plugin.powered_mob_list.get(i).id.equals(l2.getUniqueId())) { if (this.plugin.powered_mob_list.get(i).power_time+40<=Main.SERVER_TICK_TIME && this.plugin.powered_mob_list.get(i).id.equals(l2.getUniqueId())) {
@ -10540,7 +10540,7 @@ implements Listener
} }
if (e.getDamager() instanceof Projectile) { if (e.getDamager() instanceof Projectile) {
if (((Projectile)e.getDamager()).getShooter() instanceof LivingEntity) { if (((Projectile)e.getDamager()).getShooter() instanceof LivingEntity) {
LivingEntity l = ((Projectile)e.getDamager()).getShooter(); LivingEntity l = (LivingEntity)(((Projectile)e.getDamager()).getShooter());
if (l.getCustomName()!=null && l.getCustomName().contains(ChatColor.RED+"Silencer")) { if (l.getCustomName()!=null && l.getCustomName().contains(ChatColor.RED+"Silencer")) {
p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 60, 64)); p.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 60, 64));
} }
@ -11426,7 +11426,7 @@ implements Listener
},1); },1);
} }
} else { } else {
if (((Projectile)e.getDamager()).getShooter()!=null && ((Projectile)e.getDamager()).getShooter().getType()==EntityType.PLAYER) { if (((Projectile)e.getDamager()).getShooter()!=null && ((LivingEntity)((Projectile)e.getDamager()).getShooter()).getType()==EntityType.PLAYER) {
final Player p = (Player)((Projectile)e.getDamager()).getShooter(); final Player p = (Player)((Projectile)e.getDamager()).getShooter();
this.plugin.getPlayerData(p).lastsneaktime=0; this.plugin.getPlayerData(p).lastsneaktime=0;
p.getScoreboard().getTeam(p.getName().toLowerCase()).setSuffix(healthbar(p.getHealth(),p.getMaxHealth(),p.getFoodLevel())); p.getScoreboard().getTeam(p.getName().toLowerCase()).setSuffix(healthbar(p.getHealth(),p.getMaxHealth(),p.getFoodLevel()));
@ -15602,7 +15602,7 @@ implements Listener
@EventHandler @EventHandler
public void onShootArrow(ProjectileHitEvent e) { public void onShootArrow(ProjectileHitEvent e) {
LivingEntity l = e.getEntity().getShooter(); LivingEntity l = (LivingEntity)(e.getEntity().getShooter());
//Bukkit.getLogger().info("Arrow vector is: "+e.getEntity().getVelocity().toString()); //Bukkit.getLogger().info("Arrow vector is: "+e.getEntity().getVelocity().toString());
if (l!=null && l.getType()==EntityType.SKELETON && l.getCustomName()!=null) { if (l!=null && l.getType()==EntityType.SKELETON && l.getCustomName()!=null) {
if ((l.getCustomName().compareTo(ChatColor.YELLOW+"Sniper")==0)) { if ((l.getCustomName().compareTo(ChatColor.YELLOW+"Sniper")==0)) {
@ -15656,7 +15656,7 @@ implements Listener
} }
@EventHandler @EventHandler
public void onEggThrow(ProjectileHitEvent e) { public void onEggThrow(ProjectileHitEvent e) {
LivingEntity l = e.getEntity().getShooter(); LivingEntity l = (LivingEntity)(e.getEntity().getShooter());
if (e.getEntity() instanceof ThrownPotion) { if (e.getEntity() instanceof ThrownPotion) {
ThrownPotion thrownpot = (ThrownPotion)e.getEntity(); ThrownPotion thrownpot = (ThrownPotion)e.getEntity();
if (thrownpot.getShooter() instanceof Player) { if (thrownpot.getShooter() instanceof Player) {

Write Preview
Loading…
Cancel
Save