More work on Staves.

This commit is contained in:
GJ 2012-03-21 17:35:08 -04:00
parent 45974d2a19
commit 1b15828d08

View File

@ -4,6 +4,7 @@ import java.util.Collection;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Egg; import org.bukkit.entity.Egg;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Fireball; import org.bukkit.entity.Fireball;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
@ -22,7 +23,7 @@ public class Staves {
public static void altFireCheck(EntityDamageByEntityEvent event) { public static void altFireCheck(EntityDamageByEntityEvent event) {
LivingEntity defender = (LivingEntity) event.getEntity(); LivingEntity defender = (LivingEntity) event.getEntity();
Projectile attacker = (Projectile) event.getDamager(); Entity attacker = event.getDamager();
if (attacker.hasMetadata("mcmmoFiredFromStaff")) { if (attacker.hasMetadata("mcmmoFiredFromStaff")) {
event.setDamage(0); event.setDamage(0);
@ -135,11 +136,16 @@ public class Staves {
* @param shooter Player who fired the projectile * @param shooter Player who fired the projectile
*/ */
private static void snowballEffect(Player target, Player shooter) { private static void snowballEffect(Player target, Player shooter) {
if (Party.getInstance().inSameParty(target, shooter)) { int expLost = expLossCalculate();
int expGained = expGainCalculate();
if (Party.getInstance().inSameParty(target, shooter)) {
target.giveExp(expGained);
} }
else { else {
System.out.println(shooter.getLevel());
shooter.setLevel(shooter.getLevel() - 2);
System.out.println(shooter.getLevel());
} }
} }
@ -153,13 +159,13 @@ public class Staves {
return 10; return 10;
} }
private static int levelLossCalculate() { private static int expLossCalculate() {
//TODO: Calculate levels lost based on time held //TODO: Calculate exp lost based on time held
return 2; return 1000;
} }
private static int levelGainCalculate() { private static int expGainCalculate() {
//TODO: Calculate levels gained based on skill level //TODO: Calculate exp gained based on skill level
return 1; return 500;
} }
} }